Updates to CDA ecore and xls generation

modified CDA ecore to reorder function code in Performer2 along with regen
fixed issues with headers for demographics
added status back into medications
added lot text into substance administration
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
index 045b2ac..cbf2317 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
@@ -1114,9 +1114,6 @@
 
 			sheetName.substring(1, sheetName.indexOf("Section") + 7);
 
-			// for (String sheetNameKey : sheets.get(documentIndex).keySet()) {
-			// sheetNameKey.split(" ");
-			// }
 			if (!sheets.get(documentIndex).containsKey(newkey)) {
 				SXSSFWorkbook wb = getWorkbook(document, splitOption);
 
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SheetHeaderUtil.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SheetHeaderUtil.java
index 5f5918f..ec16c73 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SheetHeaderUtil.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SheetHeaderUtil.java
@@ -51,6 +51,7 @@
 		offset = addCodeHeader(row2, offset, "Marital Status");
 		offset = addCodeHeader(row2, offset, "Langauge");
 		row2.createCell(offset++).setCellValue(replaceSpace("Telephone"));
+		row2.createCell(offset++).setCellValue(replaceSpace("File Name"));
 		return offset;
 	}
 
@@ -229,13 +230,16 @@
 	static int createSubstanceAdministrationHeader(Row row1, Row row2, int offset, String type) {
 		row2.createCell(offset++).setCellValue(replaceSpace("ID"));
 		offset = addCodeHeader(row2, offset, type);
-		// row2.createCell(offset++).setCellValue(replaceSpace("Status"));
+		row2.createCell(offset++).setCellValue(replaceSpace("Status"));
 		row2.createCell(offset++).setCellValue(replaceSpace("Quantity"));
 		row2.createCell(offset++).setCellValue(replaceSpace("Location"));
 		row2.getSheet().setColumnHidden(offset - 1, hideColumns);
 		row2.createCell(offset++).setCellValue(replaceSpace("Administration Date"));
 		row2.createCell(offset++).setCellValue(replaceSpace("Location"));
 		row2.getSheet().setColumnHidden(offset - 1, hideColumns);
+		row2.createCell(offset++).setCellValue(replaceSpace("Lot Number"));
+		row2.createCell(offset++).setCellValue(replaceSpace("Location"));
+		row2.getSheet().setColumnHidden(offset - 1, hideColumns);
 		row2.createCell(offset++).setCellValue(replaceSpace("Prescription"));
 		row2.createCell(offset++).setCellValue(replaceSpace("Location"));
 		row2.getSheet().setColumnHidden(offset - 1, hideColumns);
@@ -361,6 +365,10 @@
 		row2.createCell(offset++).setCellValue(replaceSpace("Date"));
 		row2.createCell(offset++).setCellValue(replaceSpace("Location"));
 		row2.getSheet().setColumnHidden(offset - 1, hideColumns);
+		row2.createCell(offset++).setCellValue(replaceSpace("Status"));
+		row2.createCell(offset++).setCellValue(replaceSpace("Location"));
+		row2.getSheet().setColumnHidden(offset - 1, hideColumns);
+
 		offset = addCodeHeader(row2, offset, "Vital Sign");
 		row2.createCell(offset++).setCellValue(replaceSpace("Result"));
 		row2.createCell(offset++).setCellValue(replaceSpace("Location"));
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
index c71229b..42e914e 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
@@ -73,6 +73,7 @@
 import org.eclipse.mdht.uml.hl7.datatypes.IVL_TS;
 import org.eclipse.mdht.uml.hl7.datatypes.ON;
 import org.eclipse.mdht.uml.hl7.datatypes.PN;
+import org.eclipse.mdht.uml.hl7.datatypes.ST;
 import org.eclipse.mdht.uml.hl7.datatypes.SXCM_TS;
 import org.openhealthtools.mdht.uml.cda.consol.CoverageActivity;
 import org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraints;
@@ -1580,25 +1581,25 @@
 					offset = SpreadsheetSerializer.appendAddr(row, offset, patientRole.getAddrs().get(0));
 				}
 
-				if (patientRole.getPatient().getRaceCode() != null) {
-					offset = SpreadsheetSerializer.appendCode(
-						row, offset, null, patientRole.getPatient().getRaceCode(), null);
-				}
+				// if (patientRole.getPatient().getRaceCode() != null) {
+				offset = SpreadsheetSerializer.appendCode(
+					row, offset, null, patientRole.getPatient().getRaceCode(), null);
+				// }
 
-				if (patientRole.getPatient().getEthnicGroupCode() != null) {
-					offset = SpreadsheetSerializer.appendCode(
-						row, offset, null, patientRole.getPatient().getEthnicGroupCode(), null);
-				}
+				// if (patientRole.getPatient().getEthnicGroupCode() != null) {
+				offset = SpreadsheetSerializer.appendCode(
+					row, offset, null, patientRole.getPatient().getEthnicGroupCode(), null);
+				// }
 
-				if (patientRole.getPatient().getAdministrativeGenderCode() != null) {
-					offset = SpreadsheetSerializer.appendCode(
-						row, offset, null, patientRole.getPatient().getAdministrativeGenderCode(), null);
-				}
+				// if (patientRole.getPatient().getAdministrativeGenderCode() != null) {
+				offset = SpreadsheetSerializer.appendCode(
+					row, offset, null, patientRole.getPatient().getAdministrativeGenderCode(), null);
+				// }
 
-				if (patientRole.getPatient().getMaritalStatusCode() != null) {
-					offset = SpreadsheetSerializer.appendCode(
-						row, offset, null, patientRole.getPatient().getMaritalStatusCode(), null);
-				}
+				// if (patientRole.getPatient().getMaritalStatusCode() != null) {
+				offset = SpreadsheetSerializer.appendCode(
+					row, offset, null, patientRole.getPatient().getMaritalStatusCode(), null);
+				// }
 
 				if (!patientRole.getPatient().getLanguageCommunications().isEmpty()) {
 					LanguageCommunication preferredLanguage = null;
@@ -1990,6 +1991,7 @@
 		sb = new StringBuffer();
 		substanceAdministration.getEffectiveTimes();
 
+		ST lotNumberText = null;
 		boolean hasCode = false;
 		if (substanceAdministration.getConsumable() != null) {
 			Consumable consumable = substanceAdministration.getConsumable();
@@ -2004,6 +2006,8 @@
 						offset = SpreadsheetSerializer.appendCodeShowNullFlavor(
 							row, offset, substanceAdministration.getSection(),
 							manufacturedProduct.getManufacturedMaterial().getCode(), substanceAdministration.getText());
+
+						lotNumberText = manufacturedProduct.getManufacturedMaterial().getLotNumberText();
 						hasCode = true;
 
 					}
@@ -2019,12 +2023,12 @@
 				row, offset, substanceAdministration.getSection(), null, substanceAdministration.getText());
 		}
 
-		// if (substanceAdministration.getStatusCode() != null &&
-		// !StringUtils.isEmpty(substanceAdministration.getStatusCode().getCode())) {
-		// row.createCell(offset++).setCellValue(substanceAdministration.getStatusCode().getCode());
-		// } else {
-		// row.createCell(offset++).setCellValue("Missing Status");
-		// }
+		if (substanceAdministration.getStatusCode() != null &&
+				!StringUtils.isEmpty(substanceAdministration.getStatusCode().getCode())) {
+			row.createCell(offset++).setCellValue(substanceAdministration.getStatusCode().getCode());
+		} else {
+			row.createCell(offset++).setCellValue("Missing Status");
+		}
 
 		row.createCell(offset++).setCellValue(CDAValueUtil.getValue(substanceAdministration.getDoseQuantity()));
 		row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(substanceAdministration.getDoseQuantity()));
@@ -2055,6 +2059,16 @@
 
 		row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(source));
 
+		if (lotNumberText != null) {
+			row.createCell(offset++).setCellValue(lotNumberText.getText());
+			row.createCell(offset++).setCellValue(CDAUtil.getDomainPath(lotNumberText));
+
+		} else {
+			row.createCell(offset++).setCellValue("");
+			row.createCell(offset++).setCellValue("");
+
+		}
+
 		row.createCell(offset++).setCellValue(GenerateCDADataHandler.sigSwitch.doSwitch(substanceAdministration));
 
 		row.createCell(offset++).setCellValue(
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/META-INF/MANIFEST.MF b/cda/plugins/org.eclipse.mdht.uml.cda/META-INF/MANIFEST.MF
index 660fc18..981fd5e 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/META-INF/MANIFEST.MF
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/META-INF/MANIFEST.MF
@@ -2,11 +2,13 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.mdht.uml.cda;singleton:=true

+Automatic-Module-Name: org.eclipse.mdht.uml.cda

 Bundle-Version: 3.0.0.qualifier

 Bundle-ClassPath: .,

  schema/

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 Export-Package: org.eclipse.mdht.uml.cda,

  org.eclipse.mdht.uml.cda.impl,

  org.eclipse.mdht.uml.cda.internal.resource;x-internal:=true,

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.ecore b/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.ecore
index 5ff8928..cc2eaba 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.ecore
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.ecore
@@ -5891,6 +5891,15 @@
         <details key="kind" value="element"/>

       </eAnnotations>

     </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sDTCFunctionCode" ordered="false"

+        eType="ecore:EClass ../../org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.ecore#//CE"

+        containment="true">

+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

+        <details key="name" value="functionCode"/>

+        <details key="namespace" value="urn:hl7-org:sdtc"/>

+        <details key="kind" value="element"/>

+      </eAnnotations>

+    </eStructuralFeatures>

     <eStructuralFeatures xsi:type="ecore:EReference" name="time" ordered="false" eType="ecore:EClass ../../org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.ecore#//IVL_TS"

         containment="true">

       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

@@ -5919,15 +5928,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeCode" ordered="false"

         eType="ecore:EEnum ../../org.eclipse.mdht.uml.hl7.vocab/model/vocab.ecore#//ParticipationPhysicalPerformer"

         defaultValueLiteral="PRF" unsettable="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="sDTCFunctionCode" ordered="false"

-        eType="ecore:EClass ../../org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.ecore#//CE"

-        containment="true">

-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

-        <details key="name" value="functionCode"/>

-        <details key="namespace" value="urn:hl7-org:sdtc"/>

-        <details key="kind" value="element"/>

-      </eAnnotations>

-    </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Participant2" eSuperTypes="../../org.eclipse.mdht.uml.hl7.rim/model/rim.ecore#//Participation">

     <eOperations name="contextControlCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.genmodel b/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.genmodel
index 285e0cd..dbac884 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.genmodel
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.genmodel
@@ -2,7 +2,7 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"

     modelDirectory="/org.eclipse.mdht.uml.cda/src" modelPluginID="org.eclipse.mdht.uml.cda"

-    templateDirectory="platform:/plugin/org.eclipse.mdht.uml.hl7.rim/templates" dynamicTemplates="true"

+    templateDirectory="org.eclipse.mdht.uml.hl7.rim/templates" dynamicTemplates="true"

     modelName="Cda" modelPluginClass="CDAPlugin" editPluginClass="org.eclipse.mdht.uml.cda.provider.CdaEditPlugin"

     editorPluginClass="org.eclipse.mdht.uml.cda.presentation.CdaEditorPlugin" testsDirectory="/org.eclipse.mdht.uml.cda.test/src/test/java"

     testSuiteClass="org.eclipse.mdht.uml.cda.tests.CdaAllTests" importerID="org.eclipse.uml2.uml.ecore.importer"

@@ -1691,6 +1691,8 @@
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

           createChild="true" ecoreFeature="ecore:EReference cda.ecore#//Performer2/templateId"/>

       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

+          createChild="true" ecoreFeature="ecore:EReference cda.ecore#//Performer2/sDTCFunctionCode"/>

+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

           createChild="true" ecoreFeature="ecore:EReference cda.ecore#//Performer2/time"/>

       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

           createChild="true" ecoreFeature="ecore:EReference cda.ecore#//Performer2/modeCode"/>

@@ -1698,8 +1700,6 @@
           createChild="true" ecoreFeature="ecore:EReference cda.ecore#//Performer2/assignedEntity"/>

       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute cda.ecore#//Performer2/nullFlavor"/>

       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute cda.ecore#//Performer2/typeCode.1"/>

-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

-          createChild="true" ecoreFeature="ecore:EReference cda.ecore#//Performer2/sDTCFunctionCode"/>

       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="cda.ecore#//Performer2/typeCode">

         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="cda.ecore#//Performer2/typeCode/diagnostics"/>

         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="cda.ecore#//Performer2/typeCode/context"/>

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.uml b/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.uml
index c0392e8..2fca4f1 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.uml
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/model/cda.uml
@@ -5848,6 +5848,11 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fSfFAExwEd6h-an5IXo-DA"/>

         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fSfE_0xwEd6h-an5IXo-DA" value="*"/>

       </ownedAttribute>

+      <ownedAttribute xmi:id="_7XAXAGNbEeia4fKTb08hoA" name="sDTCFunctionCode" visibility="private" aggregation="composite">

+        <type xmi:type="uml:Class" href="pathmap://DATATYPES_MODEL/datatypes.uml#_Z1EGIDxaEd6JwqSGecoePg"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7XAXAWNbEeia4fKTb08hoA"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7XAXAmNbEeia4fKTb08hoA" value="1"/>

+      </ownedAttribute>

       <ownedAttribute xmi:id="_80aA4ErfEd6FXKclYGEDCw" name="time" visibility="private" aggregation="composite">

         <type xmi:type="uml:Class" href="pathmap://DATATYPES_MODEL/datatypes.uml#_QYeW4D5-Ed6cla2oXsPtlA"/>

         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9i5ekErfEd6FXKclYGEDCw"/>

@@ -5876,11 +5881,7 @@
           <instance xmi:type="uml:EnumerationLiteral" href="pathmap://VOCAB_MODEL/vocab.uml#__y7BIUDcEd6xYZuu1VKCVw"/>

         </defaultValue>

       </ownedAttribute>

-      <ownedAttribute xmi:id="_7XAXAGNbEeia4fKTb08hoA" name="sDTCFunctionCode" visibility="private" aggregation="composite">

-        <type xmi:type="uml:Class" href="pathmap://DATATYPES_MODEL/datatypes.uml#_Z1EGIDxaEd6JwqSGecoePg"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7XAXAWNbEeia4fKTb08hoA"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7XAXAmNbEeia4fKTb08hoA" value="1"/>

-      </ownedAttribute>

+      

     </packagedElement>

     <packagedElement xmi:type="uml:Class" xmi:id="_Je2yMEcaEd6besF9iFIJkQ" name="Person">

       <ownedRule xmi:id="_W3KFQCitEeCrtN9McWFciw" name="classCode" constrainedElement="_nNMFUEcEEd6besF9iFIJkQ">

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/samples/sdtcdischargedispositioncodes.xml b/cda/plugins/org.eclipse.mdht.uml.cda/samples/sdtcdischargedispositioncodes.xml
new file mode 100644
index 0000000..81a0d3a
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/samples/sdtcdischargedispositioncodes.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ClinicalDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:hl7-org:v3" xmlns:sdtc="urn:hl7-org:sdtc" xsi:schemaLocation="urn:hl7-org:v3 infrastructure/cda/CDA_SDTC.xsd">
+  <component>
+    <structuredBody>
+      <component>
+        <section>
+          <entry>
+            <encounter nullFlavor="ASKU" classCode="ACCM" moodCode="APT">
+              <realmCode/>
+              <typeId root="2.16.840.1.113883.1.3"/>
+              <templateId/>
+              <id/>
+              <code/>
+              <text/>
+              <statusCode/>
+              <effectiveTime/>
+              <sdtc:dischargeDispositionCode code="1" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="2" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="3" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="4" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="5" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="6" codeSystem="1"/>
+              <priorityCode/>
+              <subject/>
+              <specimen/>
+              <performer/>
+              <author/>
+              <informant/>
+              <participant/>
+              <entryRelationship>
+                <act/>
+              </entryRelationship>
+              <entryRelationship>
+                <encounter/>
+              </entryRelationship>
+              <entryRelationship>
+                <observation/>
+              </entryRelationship>
+              <entryRelationship>
+                <observationMedia/>
+              </entryRelationship>
+              <entryRelationship>
+                <organizer/>
+              </entryRelationship>
+              <entryRelationship>
+                <procedure/>
+              </entryRelationship>
+              <entryRelationship>
+                <regionOfInterest classCode="ROIOVL" moodCode="EVN"/>
+              </entryRelationship>
+              <entryRelationship>
+                <substanceAdministration classCode="SBADM"/>
+              </entryRelationship>
+              <entryRelationship>
+                <supply classCode="SPLY"/>
+              </entryRelationship>
+              <reference/>
+              <precondition/>
+            </encounter>
+          </entry>
+        </section>
+      </component>
+    </structuredBody>
+  </component>
+</ClinicalDocument>
\ No newline at end of file
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/samples/sdtcdischargedispositioncodes2.xml b/cda/plugins/org.eclipse.mdht.uml.cda/samples/sdtcdischargedispositioncodes2.xml
new file mode 100644
index 0000000..81a0d3a
--- /dev/null
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/samples/sdtcdischargedispositioncodes2.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ClinicalDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:hl7-org:v3" xmlns:sdtc="urn:hl7-org:sdtc" xsi:schemaLocation="urn:hl7-org:v3 infrastructure/cda/CDA_SDTC.xsd">
+  <component>
+    <structuredBody>
+      <component>
+        <section>
+          <entry>
+            <encounter nullFlavor="ASKU" classCode="ACCM" moodCode="APT">
+              <realmCode/>
+              <typeId root="2.16.840.1.113883.1.3"/>
+              <templateId/>
+              <id/>
+              <code/>
+              <text/>
+              <statusCode/>
+              <effectiveTime/>
+              <sdtc:dischargeDispositionCode code="1" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="2" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="3" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="4" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="5" codeSystem="1"/>
+              <sdtc:dischargeDispositionCode code="6" codeSystem="1"/>
+              <priorityCode/>
+              <subject/>
+              <specimen/>
+              <performer/>
+              <author/>
+              <informant/>
+              <participant/>
+              <entryRelationship>
+                <act/>
+              </entryRelationship>
+              <entryRelationship>
+                <encounter/>
+              </entryRelationship>
+              <entryRelationship>
+                <observation/>
+              </entryRelationship>
+              <entryRelationship>
+                <observationMedia/>
+              </entryRelationship>
+              <entryRelationship>
+                <organizer/>
+              </entryRelationship>
+              <entryRelationship>
+                <procedure/>
+              </entryRelationship>
+              <entryRelationship>
+                <regionOfInterest classCode="ROIOVL" moodCode="EVN"/>
+              </entryRelationship>
+              <entryRelationship>
+                <substanceAdministration classCode="SBADM"/>
+              </entryRelationship>
+              <entryRelationship>
+                <supply classCode="SPLY"/>
+              </entryRelationship>
+              <reference/>
+              <precondition/>
+            </encounter>
+          </entry>
+        </section>
+      </component>
+    </structuredBody>
+  </component>
+</ClinicalDocument>
\ No newline at end of file
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/CDAPackage.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/CDAPackage.java
index 0f1db03..a789050 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/CDAPackage.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/CDAPackage.java
@@ -6577,13 +6577,22 @@
 	int PERFORMER2__TEMPLATE_ID = RIMPackage.PARTICIPATION_FEATURE_COUNT + 2;

 

 	/**

+	 * The feature id for the '<em><b>SDTC Function Code</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int PERFORMER2__SDTC_FUNCTION_CODE = RIMPackage.PARTICIPATION_FEATURE_COUNT + 3;

+

+	/**

 	 * The feature id for the '<em><b>Time</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int PERFORMER2__TIME = RIMPackage.PARTICIPATION_FEATURE_COUNT + 3;

+	int PERFORMER2__TIME = RIMPackage.PARTICIPATION_FEATURE_COUNT + 4;

 

 	/**

 	 * The feature id for the '<em><b>Mode Code</b></em>' containment reference.

@@ -6592,7 +6601,7 @@
 	 * @generated

 	 * @ordered

 	 */

-	int PERFORMER2__MODE_CODE = RIMPackage.PARTICIPATION_FEATURE_COUNT + 4;

+	int PERFORMER2__MODE_CODE = RIMPackage.PARTICIPATION_FEATURE_COUNT + 5;

 

 	/**

 	 * The feature id for the '<em><b>Assigned Entity</b></em>' containment reference.

@@ -6601,7 +6610,7 @@
 	 * @generated

 	 * @ordered

 	 */

-	int PERFORMER2__ASSIGNED_ENTITY = RIMPackage.PARTICIPATION_FEATURE_COUNT + 5;

+	int PERFORMER2__ASSIGNED_ENTITY = RIMPackage.PARTICIPATION_FEATURE_COUNT + 6;

 

 	/**

 	 * The feature id for the '<em><b>Null Flavor</b></em>' attribute.

@@ -6610,7 +6619,7 @@
 	 * @generated

 	 * @ordered

 	 */

-	int PERFORMER2__NULL_FLAVOR = RIMPackage.PARTICIPATION_FEATURE_COUNT + 6;

+	int PERFORMER2__NULL_FLAVOR = RIMPackage.PARTICIPATION_FEATURE_COUNT + 7;

 

 	/**

 	 * The feature id for the '<em><b>Type Code</b></em>' attribute.

@@ -6619,16 +6628,7 @@
 	 * @generated

 	 * @ordered

 	 */

-	int PERFORMER2__TYPE_CODE = RIMPackage.PARTICIPATION_FEATURE_COUNT + 7;

-

-	/**

-	 * The feature id for the '<em><b>SDTC Function Code</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PERFORMER2__SDTC_FUNCTION_CODE = RIMPackage.PARTICIPATION_FEATURE_COUNT + 8;

+	int PERFORMER2__TYPE_CODE = RIMPackage.PARTICIPATION_FEATURE_COUNT + 8;

 

 	/**

 	 * The number of structural features of the '<em>Performer2</em>' class.

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/InfrastructureRootTypeId.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/InfrastructureRootTypeId.java
index e306133..5caaefe 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/InfrastructureRootTypeId.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/InfrastructureRootTypeId.java
@@ -30,8 +30,11 @@
  * @model features="redefinedRoot redefinedExtension"

  *        redefinedRootDefault="2.16.840.1.113883.1.3" redefinedRootUnsettable="true" redefinedRootDataType="org.eclipse.mdht.uml.hl7.datatypes.uid" redefinedRootRequired="true" redefinedRootOrdered="false" redefinedRootSuppressedGetVisibility="true" redefinedRootSuppressedSetVisibility="true" redefinedRootSuppressedIsSetVisibility="true" redefinedRootSuppressedUnsetVisibility="true"

  *        redefinedRootExtendedMetaData="name='root' kind='attribute'"

+ *        redefinedRootAnnotation="redefines"

  *        redefinedExtensionDataType="org.eclipse.mdht.uml.hl7.datatypes.stType" redefinedExtensionRequired="true" redefinedExtensionOrdered="false" redefinedExtensionSuppressedGetVisibility="true" redefinedExtensionSuppressedSetVisibility="true"

  *        redefinedExtensionExtendedMetaData="name='extension' kind='attribute'"

+ *        redefinedExtensionAnnotation="redefines"

+ *        annotation="duplicates"

  * @generated

  */

 public interface InfrastructureRootTypeId extends II {

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/Organizer.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/Organizer.java
index 659ef75..e676f7b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/Organizer.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/Organizer.java
@@ -50,7 +50,7 @@
  * </ul>

  *

  * @see org.eclipse.mdht.uml.cda.CDAPackage#getOrganizer()

- * @model

+ * @model annotation="duplicates"

  * @generated

  */

 public interface Organizer extends ClinicalStatement {

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/Performer2.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/Performer2.java
index 2c02854..e3522bc 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/Performer2.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/Performer2.java
@@ -34,12 +34,12 @@
  *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getRealmCodes <em>Realm Code</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getTypeId <em>Type Id</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getTemplateIds <em>Template Id</em>}</li>

+ *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getSDTCFunctionCode <em>SDTC Function Code</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getTime <em>Time</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getModeCode <em>Mode Code</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getAssignedEntity <em>Assigned Entity</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getNullFlavor <em>Null Flavor</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getTypeCode <em>Type Code</em>}</li>

- *   <li>{@link org.eclipse.mdht.uml.cda.Performer2#getSDTCFunctionCode <em>SDTC Function Code</em>}</li>

  * </ul>

  *

  * @see org.eclipse.mdht.uml.cda.CDAPackage#getPerformer2()

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ActImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ActImpl.java
index 3e42666..9d79523 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ActImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ActImpl.java
@@ -463,6 +463,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -501,6 +502,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ACT__ID);

@@ -513,6 +515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -542,6 +545,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -567,6 +571,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -596,6 +601,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -621,6 +627,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -650,6 +657,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -677,6 +685,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -706,6 +715,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -733,6 +743,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getPriorityCode() {

 		return priorityCode;

 	}

@@ -762,6 +773,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPriorityCode(CE newPriorityCode) {

 		if (newPriorityCode != priorityCode) {

 			NotificationChain msgs = null;

@@ -789,6 +801,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -818,6 +831,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -845,6 +859,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -874,6 +889,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -899,6 +915,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(Specimen.class, this, CDAPackage.ACT__SPECIMEN);

@@ -911,6 +928,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(Performer2.class, this, CDAPackage.ACT__PERFORMER);

@@ -923,6 +941,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.ACT__AUTHOR);

@@ -935,6 +954,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(Informant12.class, this, CDAPackage.ACT__INFORMANT);

@@ -947,6 +967,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -960,6 +981,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EntryRelationship> getEntryRelationships() {

 		if (entryRelationships == null) {

 			entryRelationships = new EObjectContainmentEList<EntryRelationship>(

@@ -973,6 +995,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(Reference.class, this, CDAPackage.ACT__REFERENCE);

@@ -985,6 +1008,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -1008,6 +1032,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -1028,6 +1053,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -1046,6 +1072,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1055,6 +1082,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<InFulfillmentOf1> getInFulfillmentOf1s() {

 		if (inFulfillmentOf1s == null) {

 			inFulfillmentOf1s = new EObjectContainmentEList<InFulfillmentOf1>(

@@ -1078,6 +1106,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(x_ActClassDocumentEntryAct newClassCode) {

 		x_ActClassDocumentEntryAct oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1097,6 +1126,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		x_ActClassDocumentEntryAct oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1115,6 +1145,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1134,6 +1165,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(x_DocumentActMood newMoodCode) {

 		x_DocumentActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -1153,6 +1185,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		x_DocumentActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -1171,6 +1204,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1190,6 +1224,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNegationInd(Boolean newNegationInd) {

 		Boolean oldNegationInd = negationInd;

 		negationInd = newNegationInd;

@@ -1208,6 +1243,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNegationInd() {

 		Boolean oldNegationInd = negationInd;

 		boolean oldNegationIndESet = negationIndESet;

@@ -1226,6 +1262,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNegationInd() {

 		return negationIndESet;

 	}

@@ -1594,7 +1631,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ActReferenceImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ActReferenceImpl.java
index f11a853..8a4457e 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ActReferenceImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ActReferenceImpl.java
@@ -166,6 +166,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CS> getRealmCodes() {

 		if (realmCodes == null) {

 			realmCodes = new EObjectContainmentEList<CS>(CS.class, this, CDAPackage.ACT_REFERENCE__REALM_CODE);

@@ -178,6 +179,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public InfrastructureRootTypeId getTypeId() {

 		return typeId;

 	}

@@ -207,6 +209,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -233,6 +236,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getTemplateIds() {

 		if (templateIds == null) {

 			templateIds = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ACT_REFERENCE__TEMPLATE_ID);

@@ -245,6 +249,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ACT_REFERENCE__ID);

@@ -257,6 +262,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public x_ActClassDocumentEntryAct getClassCode() {

 		return classCode;

 	}

@@ -266,6 +272,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(x_ActClassDocumentEntryAct newClassCode) {

 		x_ActClassDocumentEntryAct oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -283,6 +290,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public x_DocumentActMood getMoodCode() {

 		return moodCode;

 	}

@@ -292,6 +300,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(x_DocumentActMood newMoodCode) {

 		x_DocumentActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -309,6 +318,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EntityDeterminer getDeterminerCode() {

 		return determinerCode;

 	}

@@ -318,6 +328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -484,7 +495,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (classCode: ");

 		result.append(classCode);

 		result.append(", moodCode: ");

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedAuthorImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedAuthorImpl.java
index c14961d..180dbf0 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedAuthorImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedAuthorImpl.java
@@ -288,6 +288,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -328,6 +329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ASSIGNED_AUTHOR__ID);

@@ -340,6 +342,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -369,6 +372,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -394,6 +398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.ASSIGNED_AUTHOR__ADDR);

@@ -406,6 +411,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.ASSIGNED_AUTHOR__TELECOM);

@@ -418,6 +424,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Person getAssignedPerson() {

 		return assignedPerson;

 	}

@@ -448,6 +455,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedPerson(Person newAssignedPerson) {

 		if (newAssignedPerson != assignedPerson) {

 			NotificationChain msgs = null;

@@ -476,6 +484,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AuthoringDevice getAssignedAuthoringDevice() {

 		return assignedAuthoringDevice;

 	}

@@ -507,6 +516,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedAuthoringDevice(AuthoringDevice newAssignedAuthoringDevice) {

 		if (newAssignedAuthoringDevice != assignedAuthoringDevice) {

 			NotificationChain msgs = null;

@@ -535,6 +545,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization getRepresentedOrganization() {

 		return representedOrganization;

 	}

@@ -566,6 +577,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRepresentedOrganization(Organization newRepresentedOrganization) {

 		if (newRepresentedOrganization != representedOrganization) {

 			NotificationChain msgs = null;

@@ -604,6 +616,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -624,6 +637,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -642,6 +656,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -661,6 +676,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassAssignedEntity newClassCode) {

 		RoleClassAssignedEntity oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -681,6 +697,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassAssignedEntity oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -699,6 +716,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -938,7 +956,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedCustodianImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedCustodianImpl.java
index 282213e..5e9b93b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedCustodianImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedCustodianImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -257,6 +258,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CustodianOrganization getRepresentedCustodianOrganization() {

 		return representedCustodianOrganization;

 	}

@@ -288,6 +290,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRepresentedCustodianOrganization(CustodianOrganization newRepresentedCustodianOrganization) {

 		if (newRepresentedCustodianOrganization != representedCustodianOrganization) {

 			NotificationChain msgs = null;

@@ -328,6 +331,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -348,6 +352,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -366,6 +371,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -385,6 +391,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassAssignedEntity newClassCode) {

 		RoleClassAssignedEntity oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -405,6 +412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassAssignedEntity oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -423,6 +431,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -578,7 +587,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedEntityImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedEntityImpl.java
index 46dd1f6..b645b68 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedEntityImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssignedEntityImpl.java
@@ -288,6 +288,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -328,6 +329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ASSIGNED_ENTITY__ID);

@@ -340,6 +342,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -369,6 +372,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -394,6 +398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.ASSIGNED_ENTITY__ADDR);

@@ -406,6 +411,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.ASSIGNED_ENTITY__TELECOM);

@@ -418,6 +424,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SDTCPatient getSDTCPatient() {

 		return sDTCPatient;

 	}

@@ -447,6 +454,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCPatient(SDTCPatient newSDTCPatient) {

 		if (newSDTCPatient != sDTCPatient) {

 			NotificationChain msgs = null;

@@ -474,6 +482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Person getAssignedPerson() {

 		return assignedPerson;

 	}

@@ -504,6 +513,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedPerson(Person newAssignedPerson) {

 		if (newAssignedPerson != assignedPerson) {

 			NotificationChain msgs = null;

@@ -532,6 +542,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Organization> getRepresentedOrganizations() {

 		if (representedOrganizations == null) {

 			representedOrganizations = new EObjectContainmentEList<Organization>(

@@ -555,6 +566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -575,6 +587,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -593,6 +606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -612,6 +626,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassAssignedEntity newClassCode) {

 		RoleClassAssignedEntity oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -632,6 +647,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassAssignedEntity oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -650,6 +666,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -881,7 +898,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssociatedEntityImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssociatedEntityImpl.java
index efdcc0f..a07ed32 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssociatedEntityImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AssociatedEntityImpl.java
@@ -285,6 +285,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -325,6 +326,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ASSOCIATED_ENTITY__ID);

@@ -337,6 +339,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -366,6 +369,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -392,6 +396,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.ASSOCIATED_ENTITY__ADDR);

@@ -404,6 +409,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.ASSOCIATED_ENTITY__TELECOM);

@@ -416,6 +422,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SDTCPatient getSDTCPatient() {

 		return sDTCPatient;

 	}

@@ -445,6 +452,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCPatient(SDTCPatient newSDTCPatient) {

 		if (newSDTCPatient != sDTCPatient) {

 			NotificationChain msgs = null;

@@ -473,6 +481,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Person getAssociatedPerson() {

 		return associatedPerson;

 	}

@@ -503,6 +512,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssociatedPerson(Person newAssociatedPerson) {

 		if (newAssociatedPerson != associatedPerson) {

 			NotificationChain msgs = null;

@@ -531,6 +541,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization getScopingOrganization() {

 		return scopingOrganization;

 	}

@@ -561,6 +572,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setScopingOrganization(Organization newScopingOrganization) {

 		if (newScopingOrganization != scopingOrganization) {

 			NotificationChain msgs = null;

@@ -599,6 +611,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -619,6 +632,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -637,6 +651,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -656,6 +671,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassAssociative newClassCode) {

 		RoleClassAssociative oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -676,6 +692,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassAssociative oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -694,6 +711,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -915,7 +933,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthenticatorImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthenticatorImpl.java
index 5fc63e8..38a7f91 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthenticatorImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthenticatorImpl.java
@@ -252,6 +252,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -291,6 +292,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getTime() {

 		return time;

 	}

@@ -320,6 +322,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -345,6 +348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getSignatureCode() {

 		return signatureCode;

 	}

@@ -374,6 +378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSignatureCode(CS newSignatureCode) {

 		if (newSignatureCode != signatureCode) {

 			NotificationChain msgs = null;

@@ -402,6 +407,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity getAssignedEntity() {

 		return assignedEntity;

 	}

@@ -432,6 +438,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedEntity(AssignedEntity newAssignedEntity) {

 		if (newAssignedEntity != assignedEntity) {

 			NotificationChain msgs = null;

@@ -470,6 +477,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -490,6 +498,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -508,6 +517,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -527,6 +537,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -547,6 +558,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -565,6 +577,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -574,6 +587,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getSDTCSignatureText() {

 		return sDTCSignatureText;

 	}

@@ -604,6 +618,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCSignatureText(ED newSDTCSignatureText) {

 		if (newSDTCSignatureText != sDTCSignatureText) {

 			NotificationChain msgs = null;

@@ -814,7 +829,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthorImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthorImpl.java
index 7f5bfb1..cf573da 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthorImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthorImpl.java
@@ -273,6 +273,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -311,6 +312,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getFunctionCode() {

 		return functionCode;

 	}

@@ -340,6 +342,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setFunctionCode(CE newFunctionCode) {

 		if (newFunctionCode != functionCode) {

 			NotificationChain msgs = null;

@@ -367,6 +370,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getTime() {

 		return time;

 	}

@@ -396,6 +400,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -421,6 +426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedAuthor getAssignedAuthor() {

 		return assignedAuthor;

 	}

@@ -450,6 +456,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedAuthor(AssignedAuthor newAssignedAuthor) {

 		if (newAssignedAuthor != assignedAuthor) {

 			NotificationChain msgs = null;

@@ -487,6 +494,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -507,6 +515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -525,6 +534,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -544,6 +554,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -563,6 +574,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -581,6 +593,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -590,6 +603,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ContextControl getContextControlCode() {

 		return contextControlCode;

 	}

@@ -599,6 +613,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextControlCode(ContextControl newContextControlCode) {

 		ContextControl oldContextControlCode = contextControlCode;

 		contextControlCode = newContextControlCode == null

@@ -619,6 +634,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextControlCode() {

 		ContextControl oldContextControlCode = contextControlCode;

 		boolean oldContextControlCodeESet = contextControlCodeESet;

@@ -637,6 +653,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextControlCode() {

 		return contextControlCodeESet;

 	}

@@ -844,7 +861,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthoringDeviceImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthoringDeviceImpl.java
index 492ddbb..77e22dd 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthoringDeviceImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthoringDeviceImpl.java
@@ -283,6 +283,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -323,6 +324,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -352,6 +354,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -377,6 +380,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SC getManufacturerModelName() {

 		return manufacturerModelName;

 	}

@@ -407,6 +411,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setManufacturerModelName(SC newManufacturerModelName) {

 		if (newManufacturerModelName != manufacturerModelName) {

 			NotificationChain msgs = null;

@@ -435,6 +440,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SC getSoftwareName() {

 		return softwareName;

 	}

@@ -464,6 +470,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSoftwareName(SC newSoftwareName) {

 		if (newSoftwareName != softwareName) {

 			NotificationChain msgs = null;

@@ -492,6 +499,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<MaintainedEntity> getAsMaintainedEntities() {

 		if (asMaintainedEntities == null) {

 			asMaintainedEntities = new EObjectContainmentEList<MaintainedEntity>(

@@ -515,6 +523,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -535,6 +544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -553,6 +563,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -572,6 +583,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassDevice newClassCode) {

 		EntityClassDevice oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -592,6 +604,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassDevice oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -610,6 +623,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -629,6 +643,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -649,6 +664,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -667,6 +683,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -878,7 +895,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthorizationImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthorizationImpl.java
index 256c458..885832e 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthorizationImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/AuthorizationImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -256,6 +257,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Consent getConsent() {

 		return consent;

 	}

@@ -285,6 +287,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setConsent(Consent newConsent) {

 		if (newConsent != consent) {

 			NotificationChain msgs = null;

@@ -322,6 +325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -342,6 +346,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -360,6 +365,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -379,6 +385,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipType newTypeCode) {

 		ActRelationshipType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -399,6 +406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -417,6 +425,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -572,7 +581,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/BirthplaceImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/BirthplaceImpl.java
index e8d7691..ae7dcb5 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/BirthplaceImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/BirthplaceImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -256,6 +257,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Place getPlace() {

 		return place;

 	}

@@ -285,6 +287,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPlace(Place newPlace) {

 		if (newPlace != place) {

 			NotificationChain msgs = null;

@@ -320,6 +323,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -340,6 +344,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -358,6 +363,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -377,6 +383,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClass newClassCode) {

 		RoleClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -397,6 +404,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -415,6 +423,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -570,7 +579,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CDAFactoryImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CDAFactoryImpl.java
index a15242c..944ca65 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CDAFactoryImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CDAFactoryImpl.java
@@ -350,6 +350,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ClinicalDocument createClinicalDocument() {

 		ClinicalDocumentImpl clinicalDocument = new ClinicalDocumentImpl();

 		return clinicalDocument;

@@ -360,6 +361,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public InfrastructureRootTypeId createInfrastructureRootTypeId() {

 		InfrastructureRootTypeIdImpl infrastructureRootTypeId = new InfrastructureRootTypeIdImpl();

 		return infrastructureRootTypeId;

@@ -370,6 +372,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RecordTarget createRecordTarget() {

 		RecordTargetImpl recordTarget = new RecordTargetImpl();

 		return recordTarget;

@@ -380,6 +383,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public PatientRole createPatientRole() {

 		PatientRoleImpl patientRole = new PatientRoleImpl();

 		return patientRole;

@@ -390,6 +394,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Patient createPatient() {

 		PatientImpl patient = new PatientImpl();

 		return patient;

@@ -400,6 +405,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Guardian createGuardian() {

 		GuardianImpl guardian = new GuardianImpl();

 		return guardian;

@@ -410,6 +416,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Person createPerson() {

 		PersonImpl person = new PersonImpl();

 		return person;

@@ -420,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization createOrganization() {

 		OrganizationImpl organization = new OrganizationImpl();

 		return organization;

@@ -430,6 +438,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public OrganizationPartOf createOrganizationPartOf() {

 		OrganizationPartOfImpl organizationPartOf = new OrganizationPartOfImpl();

 		return organizationPartOf;

@@ -440,6 +449,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Birthplace createBirthplace() {

 		BirthplaceImpl birthplace = new BirthplaceImpl();

 		return birthplace;

@@ -450,6 +460,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Place createPlace() {

 		PlaceImpl place = new PlaceImpl();

 		return place;

@@ -460,6 +471,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public LanguageCommunication createLanguageCommunication() {

 		LanguageCommunicationImpl languageCommunication = new LanguageCommunicationImpl();

 		return languageCommunication;

@@ -470,6 +482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Author createAuthor() {

 		AuthorImpl author = new AuthorImpl();

 		return author;

@@ -480,6 +493,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedAuthor createAssignedAuthor() {

 		AssignedAuthorImpl assignedAuthor = new AssignedAuthorImpl();

 		return assignedAuthor;

@@ -490,6 +504,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AuthoringDevice createAuthoringDevice() {

 		AuthoringDeviceImpl authoringDevice = new AuthoringDeviceImpl();

 		return authoringDevice;

@@ -500,6 +515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public MaintainedEntity createMaintainedEntity() {

 		MaintainedEntityImpl maintainedEntity = new MaintainedEntityImpl();

 		return maintainedEntity;

@@ -510,6 +526,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public DataEnterer createDataEnterer() {

 		DataEntererImpl dataEnterer = new DataEntererImpl();

 		return dataEnterer;

@@ -520,6 +537,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity createAssignedEntity() {

 		AssignedEntityImpl assignedEntity = new AssignedEntityImpl();

 		return assignedEntity;

@@ -530,6 +548,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SDTCPatient createSDTCPatient() {

 		SDTCPatientImpl sdtcPatient = new SDTCPatientImpl();

 		return sdtcPatient;

@@ -540,6 +559,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Informant12 createInformant12() {

 		Informant12Impl informant12 = new Informant12Impl();

 		return informant12;

@@ -550,6 +570,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RelatedEntity createRelatedEntity() {

 		RelatedEntityImpl relatedEntity = new RelatedEntityImpl();

 		return relatedEntity;

@@ -560,6 +581,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Custodian createCustodian() {

 		CustodianImpl custodian = new CustodianImpl();

 		return custodian;

@@ -570,6 +592,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedCustodian createAssignedCustodian() {

 		AssignedCustodianImpl assignedCustodian = new AssignedCustodianImpl();

 		return assignedCustodian;

@@ -580,6 +603,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CustodianOrganization createCustodianOrganization() {

 		CustodianOrganizationImpl custodianOrganization = new CustodianOrganizationImpl();

 		return custodianOrganization;

@@ -590,6 +614,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public InformationRecipient createInformationRecipient() {

 		InformationRecipientImpl informationRecipient = new InformationRecipientImpl();

 		return informationRecipient;

@@ -600,6 +625,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IntendedRecipient createIntendedRecipient() {

 		IntendedRecipientImpl intendedRecipient = new IntendedRecipientImpl();

 		return intendedRecipient;

@@ -610,6 +636,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public LegalAuthenticator createLegalAuthenticator() {

 		LegalAuthenticatorImpl legalAuthenticator = new LegalAuthenticatorImpl();

 		return legalAuthenticator;

@@ -620,6 +647,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Authenticator createAuthenticator() {

 		AuthenticatorImpl authenticator = new AuthenticatorImpl();

 		return authenticator;

@@ -630,6 +658,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Participant1 createParticipant1() {

 		Participant1Impl participant1 = new Participant1Impl();

 		return participant1;

@@ -640,6 +669,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssociatedEntity createAssociatedEntity() {

 		AssociatedEntityImpl associatedEntity = new AssociatedEntityImpl();

 		return associatedEntity;

@@ -650,6 +680,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public InFulfillmentOf createInFulfillmentOf() {

 		InFulfillmentOfImpl inFulfillmentOf = new InFulfillmentOfImpl();

 		return inFulfillmentOf;

@@ -660,6 +691,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Order createOrder() {

 		OrderImpl order = new OrderImpl();

 		return order;

@@ -670,6 +702,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public DocumentationOf createDocumentationOf() {

 		DocumentationOfImpl documentationOf = new DocumentationOfImpl();

 		return documentationOf;

@@ -680,6 +713,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ServiceEvent createServiceEvent() {

 		ServiceEventImpl serviceEvent = new ServiceEventImpl();

 		return serviceEvent;

@@ -690,6 +724,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Performer1 createPerformer1() {

 		Performer1Impl performer1 = new Performer1Impl();

 		return performer1;

@@ -700,6 +735,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RelatedDocument createRelatedDocument() {

 		RelatedDocumentImpl relatedDocument = new RelatedDocumentImpl();

 		return relatedDocument;

@@ -710,6 +746,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ParentDocument createParentDocument() {

 		ParentDocumentImpl parentDocument = new ParentDocumentImpl();

 		return parentDocument;

@@ -720,6 +757,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Authorization createAuthorization() {

 		AuthorizationImpl authorization = new AuthorizationImpl();

 		return authorization;

@@ -730,6 +768,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Consent createConsent() {

 		ConsentImpl consent = new ConsentImpl();

 		return consent;

@@ -740,6 +779,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Component1 createComponent1() {

 		Component1Impl component1 = new Component1Impl();

 		return component1;

@@ -750,6 +790,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EncompassingEncounter createEncompassingEncounter() {

 		EncompassingEncounterImpl encompassingEncounter = new EncompassingEncounterImpl();

 		return encompassingEncounter;

@@ -760,6 +801,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ResponsibleParty createResponsibleParty() {

 		ResponsiblePartyImpl responsibleParty = new ResponsiblePartyImpl();

 		return responsibleParty;

@@ -770,6 +812,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EncounterParticipant createEncounterParticipant() {

 		EncounterParticipantImpl encounterParticipant = new EncounterParticipantImpl();

 		return encounterParticipant;

@@ -780,6 +823,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Location createLocation() {

 		LocationImpl location = new LocationImpl();

 		return location;

@@ -790,6 +834,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public HealthCareFacility createHealthCareFacility() {

 		HealthCareFacilityImpl healthCareFacility = new HealthCareFacilityImpl();

 		return healthCareFacility;

@@ -800,6 +845,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Component2 createComponent2() {

 		Component2Impl component2 = new Component2Impl();

 		return component2;

@@ -810,6 +856,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public NonXMLBody createNonXMLBody() {

 		NonXMLBodyImpl nonXMLBody = new NonXMLBodyImpl();

 		return nonXMLBody;

@@ -820,6 +867,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public StructuredBody createStructuredBody() {

 		StructuredBodyImpl structuredBody = new StructuredBodyImpl();

 		return structuredBody;

@@ -830,6 +878,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Component3 createComponent3() {

 		Component3Impl component3 = new Component3Impl();

 		return component3;

@@ -840,6 +889,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Section createSection() {

 		SectionImpl section = new SectionImpl();

 		return section;

@@ -850,6 +900,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public StrucDocText createStrucDocText() {

 		StrucDocTextImpl strucDocText = new StrucDocTextImpl();

 		return strucDocText;

@@ -860,6 +911,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject createSubject() {

 		SubjectImpl subject = new SubjectImpl();

 		return subject;

@@ -870,6 +922,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RelatedSubject createRelatedSubject() {

 		RelatedSubjectImpl relatedSubject = new RelatedSubjectImpl();

 		return relatedSubject;

@@ -880,6 +933,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SubjectPerson createSubjectPerson() {

 		SubjectPersonImpl subjectPerson = new SubjectPersonImpl();

 		return subjectPerson;

@@ -890,6 +944,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Entry createEntry() {

 		EntryImpl entry = new EntryImpl();

 		return entry;

@@ -900,6 +955,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Act createAct() {

 		ActImpl act = new ActImpl();

 		return act;

@@ -910,6 +966,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Specimen createSpecimen() {

 		SpecimenImpl specimen = new SpecimenImpl();

 		return specimen;

@@ -920,6 +977,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SpecimenRole createSpecimenRole() {

 		SpecimenRoleImpl specimenRole = new SpecimenRoleImpl();

 		return specimenRole;

@@ -930,6 +988,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public PlayingEntity createPlayingEntity() {

 		PlayingEntityImpl playingEntity = new PlayingEntityImpl();

 		return playingEntity;

@@ -940,6 +999,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Performer2 createPerformer2() {

 		Performer2Impl performer2 = new Performer2Impl();

 		return performer2;

@@ -950,6 +1010,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Participant2 createParticipant2() {

 		Participant2Impl participant2 = new Participant2Impl();

 		return participant2;

@@ -960,6 +1021,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ParticipantRole createParticipantRole() {

 		ParticipantRoleImpl participantRole = new ParticipantRoleImpl();

 		return participantRole;

@@ -970,6 +1032,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Device createDevice() {

 		DeviceImpl device = new DeviceImpl();

 		return device;

@@ -980,6 +1043,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Entity createEntity() {

 		EntityImpl entity = new EntityImpl();

 		return entity;

@@ -990,6 +1054,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EntryRelationship createEntryRelationship() {

 		EntryRelationshipImpl entryRelationship = new EntryRelationshipImpl();

 		return entryRelationship;

@@ -1000,6 +1065,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Encounter createEncounter() {

 		EncounterImpl encounter = new EncounterImpl();

 		return encounter;

@@ -1010,6 +1076,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Reference createReference() {

 		ReferenceImpl reference = new ReferenceImpl();

 		return reference;

@@ -1020,6 +1087,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ExternalAct createExternalAct() {

 		ExternalActImpl externalAct = new ExternalActImpl();

 		return externalAct;

@@ -1030,6 +1098,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ExternalObservation createExternalObservation() {

 		ExternalObservationImpl externalObservation = new ExternalObservationImpl();

 		return externalObservation;

@@ -1040,6 +1109,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ExternalProcedure createExternalProcedure() {

 		ExternalProcedureImpl externalProcedure = new ExternalProcedureImpl();

 		return externalProcedure;

@@ -1050,6 +1120,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ExternalDocument createExternalDocument() {

 		ExternalDocumentImpl externalDocument = new ExternalDocumentImpl();

 		return externalDocument;

@@ -1060,6 +1131,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Precondition createPrecondition() {

 		PreconditionImpl precondition = new PreconditionImpl();

 		return precondition;

@@ -1070,6 +1142,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Criterion createCriterion() {

 		CriterionImpl criterion = new CriterionImpl();

 		return criterion;

@@ -1080,6 +1153,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Observation createObservation() {

 		ObservationImpl observation = new ObservationImpl();

 		return observation;

@@ -1090,6 +1164,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ReferenceRange createReferenceRange() {

 		ReferenceRangeImpl referenceRange = new ReferenceRangeImpl();

 		return referenceRange;

@@ -1100,6 +1175,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ObservationRange createObservationRange() {

 		ObservationRangeImpl observationRange = new ObservationRangeImpl();

 		return observationRange;

@@ -1110,6 +1186,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public InFulfillmentOf1 createInFulfillmentOf1() {

 		InFulfillmentOf1Impl inFulfillmentOf1 = new InFulfillmentOf1Impl();

 		return inFulfillmentOf1;

@@ -1120,6 +1197,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ActReference createActReference() {

 		ActReferenceImpl actReference = new ActReferenceImpl();

 		return actReference;

@@ -1130,6 +1208,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ObservationMedia createObservationMedia() {

 		ObservationMediaImpl observationMedia = new ObservationMediaImpl();

 		return observationMedia;

@@ -1140,6 +1219,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organizer createOrganizer() {

 		OrganizerImpl organizer = new OrganizerImpl();

 		return organizer;

@@ -1150,6 +1230,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Component4 createComponent4() {

 		Component4Impl component4 = new Component4Impl();

 		return component4;

@@ -1160,6 +1241,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Procedure createProcedure() {

 		ProcedureImpl procedure = new ProcedureImpl();

 		return procedure;

@@ -1170,6 +1252,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RegionOfInterest createRegionOfInterest() {

 		RegionOfInterestImpl regionOfInterest = new RegionOfInterestImpl();

 		return regionOfInterest;

@@ -1180,6 +1263,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RegionOfInterestValue createRegionOfInterestValue() {

 		RegionOfInterestValueImpl regionOfInterestValue = new RegionOfInterestValueImpl();

 		return regionOfInterestValue;

@@ -1190,6 +1274,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SubstanceAdministration createSubstanceAdministration() {

 		SubstanceAdministrationImpl substanceAdministration = new SubstanceAdministrationImpl();

 		return substanceAdministration;

@@ -1200,6 +1285,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Consumable createConsumable() {

 		ConsumableImpl consumable = new ConsumableImpl();

 		return consumable;

@@ -1210,6 +1296,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ManufacturedProduct createManufacturedProduct() {

 		ManufacturedProductImpl manufacturedProduct = new ManufacturedProductImpl();

 		return manufacturedProduct;

@@ -1220,6 +1307,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public LabeledDrug createLabeledDrug() {

 		LabeledDrugImpl labeledDrug = new LabeledDrugImpl();

 		return labeledDrug;

@@ -1230,6 +1318,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Material createMaterial() {

 		MaterialImpl material = new MaterialImpl();

 		return material;

@@ -1240,6 +1329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Supply createSupply() {

 		SupplyImpl supply = new SupplyImpl();

 		return supply;

@@ -1250,6 +1340,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Product createProduct() {

 		ProductImpl product = new ProductImpl();

 		return product;

@@ -1260,6 +1351,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Component5 createComponent5() {

 		Component5Impl component5 = new Component5Impl();

 		return component5;

@@ -1270,6 +1362,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public DocumentRoot createDocumentRoot() {

 		DocumentRootImpl documentRoot = new DocumentRootImpl();

 		return documentRoot;

@@ -1280,6 +1373,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CDAPackage getCDAPackage() {

 		return (CDAPackage) getEPackage();

 	}

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CDAPackageImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CDAPackageImpl.java
index 80b2c5c..f99e79f 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CDAPackageImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CDAPackageImpl.java
@@ -754,10 +754,10 @@
 		}

 

 		// Obtain or create and register package

-		CDAPackageImpl theCDAPackage = (CDAPackageImpl) (EPackage.Registry.INSTANCE.get(

-			eNS_URI) instanceof CDAPackageImpl

-					? EPackage.Registry.INSTANCE.get(eNS_URI)

-					: new CDAPackageImpl());

+		Object registeredCDAPackage = EPackage.Registry.INSTANCE.get(eNS_URI);

+		CDAPackageImpl theCDAPackage = registeredCDAPackage instanceof CDAPackageImpl

+				? (CDAPackageImpl) registeredCDAPackage

+				: new CDAPackageImpl();

 

 		isInited = true;

 

@@ -776,6 +776,7 @@
 

 		// Register package validator

 		EValidator.Registry.INSTANCE.put(theCDAPackage, new EValidator.Descriptor() {

+			@Override

 			public EValidator getEValidator() {

 				return CDAValidator.INSTANCE;

 			}

@@ -794,6 +795,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getClinicalDocument() {

 		if (clinicalDocumentEClass == null) {

 			clinicalDocumentEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -807,6 +809,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_RealmCode() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(0);

 	}

@@ -816,6 +819,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_TypeId() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(1);

 	}

@@ -825,6 +829,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_TemplateId() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(2);

 	}

@@ -834,6 +839,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Id() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(3);

 	}

@@ -843,6 +849,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Code() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(4);

 	}

@@ -852,6 +859,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Title() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(5);

 	}

@@ -861,6 +869,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_EffectiveTime() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(6);

 	}

@@ -870,6 +879,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_ConfidentialityCode() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(7);

 	}

@@ -879,6 +889,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_LanguageCode() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(8);

 	}

@@ -888,6 +899,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_SetId() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(9);

 	}

@@ -897,6 +909,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_VersionNumber() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(10);

 	}

@@ -906,6 +919,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_CopyTime() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(11);

 	}

@@ -915,6 +929,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_RecordTarget() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(12);

 	}

@@ -924,6 +939,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Author() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(13);

 	}

@@ -933,6 +949,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_DataEnterer() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(14);

 	}

@@ -942,6 +959,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Informant() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(15);

 	}

@@ -951,6 +969,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Custodian() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(16);

 	}

@@ -960,6 +979,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_InformationRecipient() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(17);

 	}

@@ -969,6 +989,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_LegalAuthenticator() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(18);

 	}

@@ -978,6 +999,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Authenticator() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(19);

 	}

@@ -987,6 +1009,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Participant() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(20);

 	}

@@ -996,6 +1019,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_InFulfillmentOf() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(21);

 	}

@@ -1005,6 +1029,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_DocumentationOf() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(22);

 	}

@@ -1014,6 +1039,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_RelatedDocument() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(23);

 	}

@@ -1023,6 +1049,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Authorization() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(24);

 	}

@@ -1032,6 +1059,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_ComponentOf() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(25);

 	}

@@ -1041,6 +1069,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getClinicalDocument_Component() {

 		return (EReference) getClinicalDocument().getEStructuralFeatures().get(26);

 	}

@@ -1050,6 +1079,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getClinicalDocument_NullFlavor() {

 		return (EAttribute) getClinicalDocument().getEStructuralFeatures().get(27);

 	}

@@ -1059,6 +1089,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getClinicalDocument_ClassCode() {

 		return (EAttribute) getClinicalDocument().getEStructuralFeatures().get(28);

 	}

@@ -1068,6 +1099,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getClinicalDocument_MoodCode() {

 		return (EAttribute) getClinicalDocument().getEStructuralFeatures().get(29);

 	}

@@ -1077,6 +1109,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getInfrastructureRootTypeId() {

 		if (infrastructureRootTypeIdEClass == null) {

 			infrastructureRootTypeIdEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -1090,6 +1123,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInfrastructureRootTypeId_RedefinedRoot() {

 		return (EAttribute) getInfrastructureRootTypeId().getEStructuralFeatures().get(0);

 	}

@@ -1099,6 +1133,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInfrastructureRootTypeId_RedefinedExtension() {

 		return (EAttribute) getInfrastructureRootTypeId().getEStructuralFeatures().get(1);

 	}

@@ -1108,6 +1143,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getRecordTarget() {

 		if (recordTargetEClass == null) {

 			recordTargetEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -1121,6 +1157,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRecordTarget_RealmCode() {

 		return (EReference) getRecordTarget().getEStructuralFeatures().get(0);

 	}

@@ -1130,6 +1167,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRecordTarget_TypeId() {

 		return (EReference) getRecordTarget().getEStructuralFeatures().get(1);

 	}

@@ -1139,6 +1177,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRecordTarget_TemplateId() {

 		return (EReference) getRecordTarget().getEStructuralFeatures().get(2);

 	}

@@ -1148,6 +1187,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRecordTarget_PatientRole() {

 		return (EReference) getRecordTarget().getEStructuralFeatures().get(3);

 	}

@@ -1157,6 +1197,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRecordTarget_NullFlavor() {

 		return (EAttribute) getRecordTarget().getEStructuralFeatures().get(4);

 	}

@@ -1166,6 +1207,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRecordTarget_TypeCode() {

 		return (EAttribute) getRecordTarget().getEStructuralFeatures().get(5);

 	}

@@ -1175,6 +1217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRecordTarget_ContextControlCode() {

 		return (EAttribute) getRecordTarget().getEStructuralFeatures().get(6);

 	}

@@ -1184,6 +1227,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getPatientRole() {

 		if (patientRoleEClass == null) {

 			patientRoleEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -1197,6 +1241,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatientRole_RealmCode() {

 		return (EReference) getPatientRole().getEStructuralFeatures().get(0);

 	}

@@ -1206,6 +1251,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatientRole_TypeId() {

 		return (EReference) getPatientRole().getEStructuralFeatures().get(1);

 	}

@@ -1215,6 +1261,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatientRole_TemplateId() {

 		return (EReference) getPatientRole().getEStructuralFeatures().get(2);

 	}

@@ -1224,6 +1271,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatientRole_Id() {

 		return (EReference) getPatientRole().getEStructuralFeatures().get(3);

 	}

@@ -1233,6 +1281,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatientRole_Addr() {

 		return (EReference) getPatientRole().getEStructuralFeatures().get(4);

 	}

@@ -1242,6 +1291,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatientRole_Telecom() {

 		return (EReference) getPatientRole().getEStructuralFeatures().get(5);

 	}

@@ -1251,6 +1301,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatientRole_Patient() {

 		return (EReference) getPatientRole().getEStructuralFeatures().get(6);

 	}

@@ -1260,6 +1311,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatientRole_ProviderOrganization() {

 		return (EReference) getPatientRole().getEStructuralFeatures().get(7);

 	}

@@ -1269,6 +1321,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPatientRole_NullFlavor() {

 		return (EAttribute) getPatientRole().getEStructuralFeatures().get(8);

 	}

@@ -1278,6 +1331,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPatientRole_ClassCode() {

 		return (EAttribute) getPatientRole().getEStructuralFeatures().get(9);

 	}

@@ -1287,6 +1341,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getPatient() {

 		if (patientEClass == null) {

 			patientEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -1300,6 +1355,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_RealmCode() {

 		return (EReference) getPatient().getEStructuralFeatures().get(0);

 	}

@@ -1309,6 +1365,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_TypeId() {

 		return (EReference) getPatient().getEStructuralFeatures().get(1);

 	}

@@ -1318,6 +1375,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_TemplateId() {

 		return (EReference) getPatient().getEStructuralFeatures().get(2);

 	}

@@ -1327,6 +1385,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_Id() {

 		return (EReference) getPatient().getEStructuralFeatures().get(3);

 	}

@@ -1336,6 +1395,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_Name() {

 		return (EReference) getPatient().getEStructuralFeatures().get(4);

 	}

@@ -1345,6 +1405,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_AdministrativeGenderCode() {

 		return (EReference) getPatient().getEStructuralFeatures().get(5);

 	}

@@ -1354,6 +1415,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_BirthTime() {

 		return (EReference) getPatient().getEStructuralFeatures().get(6);

 	}

@@ -1363,6 +1425,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_MaritalStatusCode() {

 		return (EReference) getPatient().getEStructuralFeatures().get(7);

 	}

@@ -1372,6 +1435,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_ReligiousAffiliationCode() {

 		return (EReference) getPatient().getEStructuralFeatures().get(8);

 	}

@@ -1381,6 +1445,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_RaceCode() {

 		return (EReference) getPatient().getEStructuralFeatures().get(9);

 	}

@@ -1390,6 +1455,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_SDTCRaceCode() {

 		return (EReference) getPatient().getEStructuralFeatures().get(10);

 	}

@@ -1399,6 +1465,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_EthnicGroupCode() {

 		return (EReference) getPatient().getEStructuralFeatures().get(11);

 	}

@@ -1408,6 +1475,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_Guardian() {

 		return (EReference) getPatient().getEStructuralFeatures().get(13);

 	}

@@ -1417,6 +1485,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_Birthplace() {

 		return (EReference) getPatient().getEStructuralFeatures().get(14);

 	}

@@ -1426,6 +1495,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_LanguageCommunication() {

 		return (EReference) getPatient().getEStructuralFeatures().get(15);

 	}

@@ -1435,6 +1505,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPatient_SDTCEthnicGroupCode() {

 		return (EReference) getPatient().getEStructuralFeatures().get(12);

 	}

@@ -1444,6 +1515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPatient_NullFlavor() {

 		return (EAttribute) getPatient().getEStructuralFeatures().get(16);

 	}

@@ -1453,6 +1525,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPatient_ClassCode() {

 		return (EAttribute) getPatient().getEStructuralFeatures().get(17);

 	}

@@ -1462,6 +1535,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPatient_DeterminerCode() {

 		return (EAttribute) getPatient().getEStructuralFeatures().get(18);

 	}

@@ -1471,6 +1545,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getGuardian() {

 		if (guardianEClass == null) {

 			guardianEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -1484,6 +1559,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_RealmCode() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(0);

 	}

@@ -1493,6 +1569,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_TypeId() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(1);

 	}

@@ -1502,6 +1579,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_TemplateId() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(2);

 	}

@@ -1511,6 +1589,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_Id() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(3);

 	}

@@ -1520,6 +1599,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_Code() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(4);

 	}

@@ -1529,6 +1609,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_Addr() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(5);

 	}

@@ -1538,6 +1619,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_Telecom() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(6);

 	}

@@ -1547,6 +1629,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_GuardianPerson() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(7);

 	}

@@ -1556,6 +1639,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getGuardian_GuardianOrganization() {

 		return (EReference) getGuardian().getEStructuralFeatures().get(8);

 	}

@@ -1565,6 +1649,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getGuardian_NullFlavor() {

 		return (EAttribute) getGuardian().getEStructuralFeatures().get(9);

 	}

@@ -1574,6 +1659,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getGuardian_ClassCode() {

 		return (EAttribute) getGuardian().getEStructuralFeatures().get(10);

 	}

@@ -1583,6 +1669,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getPerson() {

 		if (personEClass == null) {

 			personEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(6);

@@ -1595,6 +1682,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerson_RealmCode() {

 		return (EReference) getPerson().getEStructuralFeatures().get(0);

 	}

@@ -1604,6 +1692,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerson_TypeId() {

 		return (EReference) getPerson().getEStructuralFeatures().get(1);

 	}

@@ -1613,6 +1702,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerson_TemplateId() {

 		return (EReference) getPerson().getEStructuralFeatures().get(2);

 	}

@@ -1622,6 +1712,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerson_Name() {

 		return (EReference) getPerson().getEStructuralFeatures().get(3);

 	}

@@ -1631,6 +1722,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerson_SDTCBirthTime() {

 		return (EReference) getPerson().getEStructuralFeatures().get(4);

 	}

@@ -1640,6 +1732,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPerson_NullFlavor() {

 		return (EAttribute) getPerson().getEStructuralFeatures().get(5);

 	}

@@ -1649,6 +1742,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPerson_ClassCode() {

 		return (EAttribute) getPerson().getEStructuralFeatures().get(6);

 	}

@@ -1658,6 +1752,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPerson_DeterminerCode() {

 		return (EAttribute) getPerson().getEStructuralFeatures().get(7);

 	}

@@ -1667,6 +1762,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getOrganization() {

 		if (organizationEClass == null) {

 			organizationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -1680,6 +1776,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_RealmCode() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(0);

 	}

@@ -1689,6 +1786,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_TypeId() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(1);

 	}

@@ -1698,6 +1796,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_TemplateId() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(2);

 	}

@@ -1707,6 +1806,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_Id() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(3);

 	}

@@ -1716,6 +1816,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_Name() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(4);

 	}

@@ -1725,6 +1826,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_Telecom() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(5);

 	}

@@ -1734,6 +1836,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_Addr() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(6);

 	}

@@ -1743,6 +1846,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_StandardIndustryClassCode() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(7);

 	}

@@ -1752,6 +1856,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganization_AsOrganizationPartOf() {

 		return (EReference) getOrganization().getEStructuralFeatures().get(8);

 	}

@@ -1761,6 +1866,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrganization_NullFlavor() {

 		return (EAttribute) getOrganization().getEStructuralFeatures().get(9);

 	}

@@ -1770,6 +1876,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrganization_ClassCode() {

 		return (EAttribute) getOrganization().getEStructuralFeatures().get(10);

 	}

@@ -1779,6 +1886,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrganization_DeterminerCode() {

 		return (EAttribute) getOrganization().getEStructuralFeatures().get(11);

 	}

@@ -1788,6 +1896,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getOrganizationPartOf() {

 		if (organizationPartOfEClass == null) {

 			organizationPartOfEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -1801,6 +1910,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizationPartOf_RealmCode() {

 		return (EReference) getOrganizationPartOf().getEStructuralFeatures().get(0);

 	}

@@ -1810,6 +1920,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizationPartOf_TypeId() {

 		return (EReference) getOrganizationPartOf().getEStructuralFeatures().get(1);

 	}

@@ -1819,6 +1930,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizationPartOf_TemplateId() {

 		return (EReference) getOrganizationPartOf().getEStructuralFeatures().get(2);

 	}

@@ -1828,6 +1940,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizationPartOf_Id() {

 		return (EReference) getOrganizationPartOf().getEStructuralFeatures().get(3);

 	}

@@ -1837,6 +1950,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizationPartOf_Code() {

 		return (EReference) getOrganizationPartOf().getEStructuralFeatures().get(4);

 	}

@@ -1846,6 +1960,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizationPartOf_StatusCode() {

 		return (EReference) getOrganizationPartOf().getEStructuralFeatures().get(5);

 	}

@@ -1855,6 +1970,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizationPartOf_EffectiveTime() {

 		return (EReference) getOrganizationPartOf().getEStructuralFeatures().get(6);

 	}

@@ -1864,6 +1980,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizationPartOf_WholeOrganization() {

 		return (EReference) getOrganizationPartOf().getEStructuralFeatures().get(7);

 	}

@@ -1873,6 +1990,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrganizationPartOf_NullFlavor() {

 		return (EAttribute) getOrganizationPartOf().getEStructuralFeatures().get(8);

 	}

@@ -1882,6 +2000,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrganizationPartOf_ClassCode() {

 		return (EAttribute) getOrganizationPartOf().getEStructuralFeatures().get(9);

 	}

@@ -1891,6 +2010,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getBirthplace() {

 		if (birthplaceEClass == null) {

 			birthplaceEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -1904,6 +2024,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getBirthplace_RealmCode() {

 		return (EReference) getBirthplace().getEStructuralFeatures().get(0);

 	}

@@ -1913,6 +2034,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getBirthplace_TypeId() {

 		return (EReference) getBirthplace().getEStructuralFeatures().get(1);

 	}

@@ -1922,6 +2044,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getBirthplace_TemplateId() {

 		return (EReference) getBirthplace().getEStructuralFeatures().get(2);

 	}

@@ -1931,6 +2054,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getBirthplace_Place() {

 		return (EReference) getBirthplace().getEStructuralFeatures().get(3);

 	}

@@ -1940,6 +2064,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getBirthplace_NullFlavor() {

 		return (EAttribute) getBirthplace().getEStructuralFeatures().get(4);

 	}

@@ -1949,6 +2074,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getBirthplace_ClassCode() {

 		return (EAttribute) getBirthplace().getEStructuralFeatures().get(5);

 	}

@@ -1958,6 +2084,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getPlace() {

 		if (placeEClass == null) {

 			placeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(10);

@@ -1970,6 +2097,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlace_RealmCode() {

 		return (EReference) getPlace().getEStructuralFeatures().get(0);

 	}

@@ -1979,6 +2107,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlace_TypeId() {

 		return (EReference) getPlace().getEStructuralFeatures().get(1);

 	}

@@ -1988,6 +2117,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlace_TemplateId() {

 		return (EReference) getPlace().getEStructuralFeatures().get(2);

 	}

@@ -1997,6 +2127,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlace_Name() {

 		return (EReference) getPlace().getEStructuralFeatures().get(3);

 	}

@@ -2006,6 +2137,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlace_Addr() {

 		return (EReference) getPlace().getEStructuralFeatures().get(4);

 	}

@@ -2015,6 +2147,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPlace_NullFlavor() {

 		return (EAttribute) getPlace().getEStructuralFeatures().get(5);

 	}

@@ -2024,6 +2157,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPlace_ClassCode() {

 		return (EAttribute) getPlace().getEStructuralFeatures().get(6);

 	}

@@ -2033,6 +2167,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPlace_DeterminerCode() {

 		return (EAttribute) getPlace().getEStructuralFeatures().get(7);

 	}

@@ -2042,6 +2177,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getLanguageCommunication() {

 		if (languageCommunicationEClass == null) {

 			languageCommunicationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2055,6 +2191,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLanguageCommunication_RealmCode() {

 		return (EReference) getLanguageCommunication().getEStructuralFeatures().get(0);

 	}

@@ -2064,6 +2201,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLanguageCommunication_TypeId() {

 		return (EReference) getLanguageCommunication().getEStructuralFeatures().get(1);

 	}

@@ -2073,6 +2211,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLanguageCommunication_TemplateId() {

 		return (EReference) getLanguageCommunication().getEStructuralFeatures().get(2);

 	}

@@ -2082,6 +2221,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLanguageCommunication_LanguageCode() {

 		return (EReference) getLanguageCommunication().getEStructuralFeatures().get(3);

 	}

@@ -2091,6 +2231,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLanguageCommunication_ModeCode() {

 		return (EReference) getLanguageCommunication().getEStructuralFeatures().get(4);

 	}

@@ -2100,6 +2241,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLanguageCommunication_ProficiencyLevelCode() {

 		return (EReference) getLanguageCommunication().getEStructuralFeatures().get(5);

 	}

@@ -2109,6 +2251,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLanguageCommunication_PreferenceInd() {

 		return (EReference) getLanguageCommunication().getEStructuralFeatures().get(6);

 	}

@@ -2118,6 +2261,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLanguageCommunication_NullFlavor() {

 		return (EAttribute) getLanguageCommunication().getEStructuralFeatures().get(7);

 	}

@@ -2127,6 +2271,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAuthor() {

 		if (authorEClass == null) {

 			authorEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -2140,6 +2285,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthor_RealmCode() {

 		return (EReference) getAuthor().getEStructuralFeatures().get(0);

 	}

@@ -2149,6 +2295,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthor_TypeId() {

 		return (EReference) getAuthor().getEStructuralFeatures().get(1);

 	}

@@ -2158,6 +2305,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthor_TemplateId() {

 		return (EReference) getAuthor().getEStructuralFeatures().get(2);

 	}

@@ -2167,6 +2315,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthor_FunctionCode() {

 		return (EReference) getAuthor().getEStructuralFeatures().get(3);

 	}

@@ -2176,6 +2325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthor_Time() {

 		return (EReference) getAuthor().getEStructuralFeatures().get(4);

 	}

@@ -2185,6 +2335,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthor_AssignedAuthor() {

 		return (EReference) getAuthor().getEStructuralFeatures().get(5);

 	}

@@ -2194,6 +2345,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthor_NullFlavor() {

 		return (EAttribute) getAuthor().getEStructuralFeatures().get(6);

 	}

@@ -2203,6 +2355,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthor_TypeCode() {

 		return (EAttribute) getAuthor().getEStructuralFeatures().get(7);

 	}

@@ -2212,6 +2365,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthor_ContextControlCode() {

 		return (EAttribute) getAuthor().getEStructuralFeatures().get(8);

 	}

@@ -2221,6 +2375,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAssignedAuthor() {

 		if (assignedAuthorEClass == null) {

 			assignedAuthorEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2234,6 +2389,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_RealmCode() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(0);

 	}

@@ -2243,6 +2399,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_TypeId() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(1);

 	}

@@ -2252,6 +2409,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_TemplateId() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(2);

 	}

@@ -2261,6 +2419,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_Id() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(3);

 	}

@@ -2270,6 +2429,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_Code() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(4);

 	}

@@ -2279,6 +2439,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_Addr() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(5);

 	}

@@ -2288,6 +2449,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_Telecom() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(6);

 	}

@@ -2297,6 +2459,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_AssignedPerson() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(7);

 	}

@@ -2306,6 +2469,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_AssignedAuthoringDevice() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(8);

 	}

@@ -2315,6 +2479,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedAuthor_RepresentedOrganization() {

 		return (EReference) getAssignedAuthor().getEStructuralFeatures().get(9);

 	}

@@ -2324,6 +2489,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAssignedAuthor_NullFlavor() {

 		return (EAttribute) getAssignedAuthor().getEStructuralFeatures().get(10);

 	}

@@ -2333,6 +2499,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAssignedAuthor_ClassCode() {

 		return (EAttribute) getAssignedAuthor().getEStructuralFeatures().get(11);

 	}

@@ -2342,6 +2509,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAuthoringDevice() {

 		if (authoringDeviceEClass == null) {

 			authoringDeviceEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2355,6 +2523,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthoringDevice_RealmCode() {

 		return (EReference) getAuthoringDevice().getEStructuralFeatures().get(0);

 	}

@@ -2364,6 +2533,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthoringDevice_TypeId() {

 		return (EReference) getAuthoringDevice().getEStructuralFeatures().get(1);

 	}

@@ -2373,6 +2543,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthoringDevice_TemplateId() {

 		return (EReference) getAuthoringDevice().getEStructuralFeatures().get(2);

 	}

@@ -2382,6 +2553,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthoringDevice_Code() {

 		return (EReference) getAuthoringDevice().getEStructuralFeatures().get(3);

 	}

@@ -2391,6 +2563,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthoringDevice_ManufacturerModelName() {

 		return (EReference) getAuthoringDevice().getEStructuralFeatures().get(4);

 	}

@@ -2400,6 +2573,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthoringDevice_SoftwareName() {

 		return (EReference) getAuthoringDevice().getEStructuralFeatures().get(5);

 	}

@@ -2409,6 +2583,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthoringDevice_AsMaintainedEntity() {

 		return (EReference) getAuthoringDevice().getEStructuralFeatures().get(6);

 	}

@@ -2418,6 +2593,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthoringDevice_NullFlavor() {

 		return (EAttribute) getAuthoringDevice().getEStructuralFeatures().get(7);

 	}

@@ -2427,6 +2603,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthoringDevice_ClassCode() {

 		return (EAttribute) getAuthoringDevice().getEStructuralFeatures().get(8);

 	}

@@ -2436,6 +2613,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthoringDevice_DeterminerCode() {

 		return (EAttribute) getAuthoringDevice().getEStructuralFeatures().get(9);

 	}

@@ -2445,6 +2623,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getMaintainedEntity() {

 		if (maintainedEntityEClass == null) {

 			maintainedEntityEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2458,6 +2637,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaintainedEntity_RealmCode() {

 		return (EReference) getMaintainedEntity().getEStructuralFeatures().get(0);

 	}

@@ -2467,6 +2647,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaintainedEntity_TypeId() {

 		return (EReference) getMaintainedEntity().getEStructuralFeatures().get(1);

 	}

@@ -2476,6 +2657,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaintainedEntity_TemplateId() {

 		return (EReference) getMaintainedEntity().getEStructuralFeatures().get(2);

 	}

@@ -2485,6 +2667,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaintainedEntity_EffectiveTime() {

 		return (EReference) getMaintainedEntity().getEStructuralFeatures().get(3);

 	}

@@ -2494,6 +2677,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaintainedEntity_MaintainingPerson() {

 		return (EReference) getMaintainedEntity().getEStructuralFeatures().get(4);

 	}

@@ -2503,6 +2687,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getMaintainedEntity_NullFlavor() {

 		return (EAttribute) getMaintainedEntity().getEStructuralFeatures().get(5);

 	}

@@ -2512,6 +2697,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getMaintainedEntity_ClassCode() {

 		return (EAttribute) getMaintainedEntity().getEStructuralFeatures().get(6);

 	}

@@ -2521,6 +2707,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getDataEnterer() {

 		if (dataEntererEClass == null) {

 			dataEntererEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2534,6 +2721,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDataEnterer_RealmCode() {

 		return (EReference) getDataEnterer().getEStructuralFeatures().get(0);

 	}

@@ -2543,6 +2731,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDataEnterer_TypeId() {

 		return (EReference) getDataEnterer().getEStructuralFeatures().get(1);

 	}

@@ -2552,6 +2741,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDataEnterer_TemplateId() {

 		return (EReference) getDataEnterer().getEStructuralFeatures().get(2);

 	}

@@ -2561,6 +2751,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDataEnterer_Time() {

 		return (EReference) getDataEnterer().getEStructuralFeatures().get(3);

 	}

@@ -2570,6 +2761,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDataEnterer_AssignedEntity() {

 		return (EReference) getDataEnterer().getEStructuralFeatures().get(4);

 	}

@@ -2579,6 +2771,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDataEnterer_NullFlavor() {

 		return (EAttribute) getDataEnterer().getEStructuralFeatures().get(5);

 	}

@@ -2588,6 +2781,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDataEnterer_TypeCode() {

 		return (EAttribute) getDataEnterer().getEStructuralFeatures().get(6);

 	}

@@ -2597,6 +2791,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDataEnterer_ContextControlCode() {

 		return (EAttribute) getDataEnterer().getEStructuralFeatures().get(7);

 	}

@@ -2606,6 +2801,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAssignedEntity() {

 		if (assignedEntityEClass == null) {

 			assignedEntityEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2619,6 +2815,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_RealmCode() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(0);

 	}

@@ -2628,6 +2825,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_TypeId() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(1);

 	}

@@ -2637,6 +2835,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_TemplateId() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(2);

 	}

@@ -2646,6 +2845,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_Id() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(3);

 	}

@@ -2655,6 +2855,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_Code() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(4);

 	}

@@ -2664,6 +2865,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_Addr() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(5);

 	}

@@ -2673,6 +2875,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_Telecom() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(6);

 	}

@@ -2682,6 +2885,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_SDTCPatient() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(9);

 	}

@@ -2691,6 +2895,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_AssignedPerson() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(7);

 	}

@@ -2700,6 +2905,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedEntity_RepresentedOrganization() {

 		return (EReference) getAssignedEntity().getEStructuralFeatures().get(8);

 	}

@@ -2709,6 +2915,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAssignedEntity_NullFlavor() {

 		return (EAttribute) getAssignedEntity().getEStructuralFeatures().get(10);

 	}

@@ -2718,6 +2925,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAssignedEntity_ClassCode() {

 		return (EAttribute) getAssignedEntity().getEStructuralFeatures().get(11);

 	}

@@ -2727,6 +2935,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getSDTCPatient() {

 		if (sdtcPatientEClass == null) {

 			sdtcPatientEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2740,6 +2949,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSDTCPatient_Id() {

 		return (EReference) getSDTCPatient().getEStructuralFeatures().get(0);

 	}

@@ -2749,6 +2959,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getInformant12() {

 		if (informant12EClass == null) {

 			informant12EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2762,6 +2973,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformant12_RealmCode() {

 		return (EReference) getInformant12().getEStructuralFeatures().get(0);

 	}

@@ -2771,6 +2983,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformant12_TypeId() {

 		return (EReference) getInformant12().getEStructuralFeatures().get(1);

 	}

@@ -2780,6 +2993,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformant12_TemplateId() {

 		return (EReference) getInformant12().getEStructuralFeatures().get(2);

 	}

@@ -2789,6 +3003,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformant12_AssignedEntity() {

 		return (EReference) getInformant12().getEStructuralFeatures().get(3);

 	}

@@ -2798,6 +3013,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformant12_RelatedEntity() {

 		return (EReference) getInformant12().getEStructuralFeatures().get(4);

 	}

@@ -2807,6 +3023,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInformant12_NullFlavor() {

 		return (EAttribute) getInformant12().getEStructuralFeatures().get(5);

 	}

@@ -2816,6 +3033,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInformant12_TypeCode() {

 		return (EAttribute) getInformant12().getEStructuralFeatures().get(6);

 	}

@@ -2825,6 +3043,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInformant12_ContextControlCode() {

 		return (EAttribute) getInformant12().getEStructuralFeatures().get(7);

 	}

@@ -2834,6 +3053,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getRelatedEntity() {

 		if (relatedEntityEClass == null) {

 			relatedEntityEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -2847,6 +3067,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_RealmCode() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(0);

 	}

@@ -2856,6 +3077,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_TypeId() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(1);

 	}

@@ -2865,6 +3087,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_TemplateId() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(2);

 	}

@@ -2874,6 +3097,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_Code() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(3);

 	}

@@ -2883,6 +3107,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_Addr() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(4);

 	}

@@ -2892,6 +3117,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_Telecom() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(5);

 	}

@@ -2901,6 +3127,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_EffectiveTime() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(6);

 	}

@@ -2910,6 +3137,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_SDTCPatient() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(8);

 	}

@@ -2919,6 +3147,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedEntity_RelatedPerson() {

 		return (EReference) getRelatedEntity().getEStructuralFeatures().get(7);

 	}

@@ -2928,6 +3157,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRelatedEntity_NullFlavor() {

 		return (EAttribute) getRelatedEntity().getEStructuralFeatures().get(9);

 	}

@@ -2937,6 +3167,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRelatedEntity_ClassCode() {

 		return (EAttribute) getRelatedEntity().getEStructuralFeatures().get(10);

 	}

@@ -2946,6 +3177,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getCustodian() {

 		if (custodianEClass == null) {

 			custodianEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -2959,6 +3191,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodian_RealmCode() {

 		return (EReference) getCustodian().getEStructuralFeatures().get(0);

 	}

@@ -2968,6 +3201,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodian_TypeId() {

 		return (EReference) getCustodian().getEStructuralFeatures().get(1);

 	}

@@ -2977,6 +3211,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodian_TemplateId() {

 		return (EReference) getCustodian().getEStructuralFeatures().get(2);

 	}

@@ -2986,6 +3221,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodian_AssignedCustodian() {

 		return (EReference) getCustodian().getEStructuralFeatures().get(3);

 	}

@@ -2995,6 +3231,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getCustodian_NullFlavor() {

 		return (EAttribute) getCustodian().getEStructuralFeatures().get(4);

 	}

@@ -3004,6 +3241,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getCustodian_TypeCode() {

 		return (EAttribute) getCustodian().getEStructuralFeatures().get(5);

 	}

@@ -3013,6 +3251,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAssignedCustodian() {

 		if (assignedCustodianEClass == null) {

 			assignedCustodianEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3026,6 +3265,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedCustodian_RealmCode() {

 		return (EReference) getAssignedCustodian().getEStructuralFeatures().get(0);

 	}

@@ -3035,6 +3275,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedCustodian_TypeId() {

 		return (EReference) getAssignedCustodian().getEStructuralFeatures().get(1);

 	}

@@ -3044,6 +3285,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedCustodian_TemplateId() {

 		return (EReference) getAssignedCustodian().getEStructuralFeatures().get(2);

 	}

@@ -3053,6 +3295,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssignedCustodian_RepresentedCustodianOrganization() {

 		return (EReference) getAssignedCustodian().getEStructuralFeatures().get(3);

 	}

@@ -3062,6 +3305,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAssignedCustodian_NullFlavor() {

 		return (EAttribute) getAssignedCustodian().getEStructuralFeatures().get(4);

 	}

@@ -3071,6 +3315,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAssignedCustodian_ClassCode() {

 		return (EAttribute) getAssignedCustodian().getEStructuralFeatures().get(5);

 	}

@@ -3080,6 +3325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getCustodianOrganization() {

 		if (custodianOrganizationEClass == null) {

 			custodianOrganizationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3093,6 +3339,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodianOrganization_RealmCode() {

 		return (EReference) getCustodianOrganization().getEStructuralFeatures().get(0);

 	}

@@ -3102,6 +3349,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodianOrganization_TypeId() {

 		return (EReference) getCustodianOrganization().getEStructuralFeatures().get(1);

 	}

@@ -3111,6 +3359,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodianOrganization_TemplateId() {

 		return (EReference) getCustodianOrganization().getEStructuralFeatures().get(2);

 	}

@@ -3120,6 +3369,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodianOrganization_Id() {

 		return (EReference) getCustodianOrganization().getEStructuralFeatures().get(3);

 	}

@@ -3129,6 +3379,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodianOrganization_Name() {

 		return (EReference) getCustodianOrganization().getEStructuralFeatures().get(4);

 	}

@@ -3138,6 +3389,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodianOrganization_Telecom() {

 		return (EReference) getCustodianOrganization().getEStructuralFeatures().get(5);

 	}

@@ -3147,6 +3399,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCustodianOrganization_Addr() {

 		return (EReference) getCustodianOrganization().getEStructuralFeatures().get(6);

 	}

@@ -3156,6 +3409,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getCustodianOrganization_NullFlavor() {

 		return (EAttribute) getCustodianOrganization().getEStructuralFeatures().get(7);

 	}

@@ -3165,6 +3419,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getCustodianOrganization_ClassCode() {

 		return (EAttribute) getCustodianOrganization().getEStructuralFeatures().get(8);

 	}

@@ -3174,6 +3429,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getCustodianOrganization_DeterminerCode() {

 		return (EAttribute) getCustodianOrganization().getEStructuralFeatures().get(9);

 	}

@@ -3183,6 +3439,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getInformationRecipient() {

 		if (informationRecipientEClass == null) {

 			informationRecipientEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3196,6 +3453,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformationRecipient_RealmCode() {

 		return (EReference) getInformationRecipient().getEStructuralFeatures().get(0);

 	}

@@ -3205,6 +3463,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformationRecipient_TypeId() {

 		return (EReference) getInformationRecipient().getEStructuralFeatures().get(1);

 	}

@@ -3214,6 +3473,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformationRecipient_TemplateId() {

 		return (EReference) getInformationRecipient().getEStructuralFeatures().get(2);

 	}

@@ -3223,6 +3483,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInformationRecipient_IntendedRecipient() {

 		return (EReference) getInformationRecipient().getEStructuralFeatures().get(3);

 	}

@@ -3232,6 +3493,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInformationRecipient_NullFlavor() {

 		return (EAttribute) getInformationRecipient().getEStructuralFeatures().get(4);

 	}

@@ -3241,6 +3503,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInformationRecipient_TypeCode() {

 		return (EAttribute) getInformationRecipient().getEStructuralFeatures().get(5);

 	}

@@ -3250,6 +3513,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getIntendedRecipient() {

 		if (intendedRecipientEClass == null) {

 			intendedRecipientEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3263,6 +3527,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getIntendedRecipient_RealmCode() {

 		return (EReference) getIntendedRecipient().getEStructuralFeatures().get(0);

 	}

@@ -3272,6 +3537,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getIntendedRecipient_TypeId() {

 		return (EReference) getIntendedRecipient().getEStructuralFeatures().get(1);

 	}

@@ -3281,6 +3547,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getIntendedRecipient_TemplateId() {

 		return (EReference) getIntendedRecipient().getEStructuralFeatures().get(2);

 	}

@@ -3290,6 +3557,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getIntendedRecipient_Id() {

 		return (EReference) getIntendedRecipient().getEStructuralFeatures().get(3);

 	}

@@ -3299,6 +3567,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getIntendedRecipient_Addr() {

 		return (EReference) getIntendedRecipient().getEStructuralFeatures().get(4);

 	}

@@ -3308,6 +3577,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getIntendedRecipient_Telecom() {

 		return (EReference) getIntendedRecipient().getEStructuralFeatures().get(5);

 	}

@@ -3317,6 +3587,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getIntendedRecipient_InformationRecipient() {

 		return (EReference) getIntendedRecipient().getEStructuralFeatures().get(6);

 	}

@@ -3326,6 +3597,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getIntendedRecipient_ReceivedOrganization() {

 		return (EReference) getIntendedRecipient().getEStructuralFeatures().get(7);

 	}

@@ -3335,6 +3607,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getIntendedRecipient_NullFlavor() {

 		return (EAttribute) getIntendedRecipient().getEStructuralFeatures().get(8);

 	}

@@ -3344,6 +3617,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getIntendedRecipient_ClassCode() {

 		return (EAttribute) getIntendedRecipient().getEStructuralFeatures().get(9);

 	}

@@ -3353,6 +3627,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getLegalAuthenticator() {

 		if (legalAuthenticatorEClass == null) {

 			legalAuthenticatorEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3366,6 +3641,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLegalAuthenticator_RealmCode() {

 		return (EReference) getLegalAuthenticator().getEStructuralFeatures().get(0);

 	}

@@ -3375,6 +3651,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLegalAuthenticator_TypeId() {

 		return (EReference) getLegalAuthenticator().getEStructuralFeatures().get(1);

 	}

@@ -3384,6 +3661,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLegalAuthenticator_TemplateId() {

 		return (EReference) getLegalAuthenticator().getEStructuralFeatures().get(2);

 	}

@@ -3393,6 +3671,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLegalAuthenticator_Time() {

 		return (EReference) getLegalAuthenticator().getEStructuralFeatures().get(3);

 	}

@@ -3402,6 +3681,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLegalAuthenticator_SignatureCode() {

 		return (EReference) getLegalAuthenticator().getEStructuralFeatures().get(4);

 	}

@@ -3411,6 +3691,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLegalAuthenticator_AssignedEntity() {

 		return (EReference) getLegalAuthenticator().getEStructuralFeatures().get(5);

 	}

@@ -3420,6 +3701,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLegalAuthenticator_NullFlavor() {

 		return (EAttribute) getLegalAuthenticator().getEStructuralFeatures().get(6);

 	}

@@ -3429,6 +3711,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLegalAuthenticator_TypeCode() {

 		return (EAttribute) getLegalAuthenticator().getEStructuralFeatures().get(7);

 	}

@@ -3438,6 +3721,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLegalAuthenticator_ContextControlCode() {

 		return (EAttribute) getLegalAuthenticator().getEStructuralFeatures().get(8);

 	}

@@ -3447,6 +3731,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLegalAuthenticator_SDTCSignatureText() {

 		return (EReference) getLegalAuthenticator().getEStructuralFeatures().get(9);

 	}

@@ -3456,6 +3741,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAuthenticator() {

 		if (authenticatorEClass == null) {

 			authenticatorEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3469,6 +3755,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthenticator_RealmCode() {

 		return (EReference) getAuthenticator().getEStructuralFeatures().get(0);

 	}

@@ -3478,6 +3765,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthenticator_TypeId() {

 		return (EReference) getAuthenticator().getEStructuralFeatures().get(1);

 	}

@@ -3487,6 +3775,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthenticator_TemplateId() {

 		return (EReference) getAuthenticator().getEStructuralFeatures().get(2);

 	}

@@ -3496,6 +3785,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthenticator_Time() {

 		return (EReference) getAuthenticator().getEStructuralFeatures().get(3);

 	}

@@ -3505,6 +3795,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthenticator_SignatureCode() {

 		return (EReference) getAuthenticator().getEStructuralFeatures().get(4);

 	}

@@ -3514,6 +3805,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthenticator_AssignedEntity() {

 		return (EReference) getAuthenticator().getEStructuralFeatures().get(5);

 	}

@@ -3523,6 +3815,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthenticator_NullFlavor() {

 		return (EAttribute) getAuthenticator().getEStructuralFeatures().get(6);

 	}

@@ -3532,6 +3825,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthenticator_TypeCode() {

 		return (EAttribute) getAuthenticator().getEStructuralFeatures().get(7);

 	}

@@ -3541,6 +3835,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthenticator_SDTCSignatureText() {

 		return (EReference) getAuthenticator().getEStructuralFeatures().get(8);

 	}

@@ -3550,6 +3845,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getParticipant1() {

 		if (participant1EClass == null) {

 			participant1EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3563,6 +3859,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant1_RealmCode() {

 		return (EReference) getParticipant1().getEStructuralFeatures().get(0);

 	}

@@ -3572,6 +3869,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant1_TypeId() {

 		return (EReference) getParticipant1().getEStructuralFeatures().get(1);

 	}

@@ -3581,6 +3879,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant1_TemplateId() {

 		return (EReference) getParticipant1().getEStructuralFeatures().get(2);

 	}

@@ -3590,6 +3889,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant1_FunctionCode() {

 		return (EReference) getParticipant1().getEStructuralFeatures().get(3);

 	}

@@ -3599,6 +3899,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant1_Time() {

 		return (EReference) getParticipant1().getEStructuralFeatures().get(4);

 	}

@@ -3608,6 +3909,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant1_AssociatedEntity() {

 		return (EReference) getParticipant1().getEStructuralFeatures().get(5);

 	}

@@ -3617,6 +3919,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParticipant1_NullFlavor() {

 		return (EAttribute) getParticipant1().getEStructuralFeatures().get(6);

 	}

@@ -3626,6 +3929,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParticipant1_TypeCode() {

 		return (EAttribute) getParticipant1().getEStructuralFeatures().get(7);

 	}

@@ -3635,6 +3939,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParticipant1_ContextControlCode() {

 		return (EAttribute) getParticipant1().getEStructuralFeatures().get(8);

 	}

@@ -3644,6 +3949,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAssociatedEntity() {

 		if (associatedEntityEClass == null) {

 			associatedEntityEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3657,6 +3963,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_RealmCode() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(0);

 	}

@@ -3666,6 +3973,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_TypeId() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(1);

 	}

@@ -3675,6 +3983,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_TemplateId() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(2);

 	}

@@ -3684,6 +3993,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_Id() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(3);

 	}

@@ -3693,6 +4003,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_Code() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(4);

 	}

@@ -3702,6 +4013,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_Addr() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(5);

 	}

@@ -3711,6 +4023,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_Telecom() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(6);

 	}

@@ -3720,6 +4033,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_SDTCPatient() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(9);

 	}

@@ -3729,6 +4043,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_AssociatedPerson() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(7);

 	}

@@ -3738,6 +4053,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAssociatedEntity_ScopingOrganization() {

 		return (EReference) getAssociatedEntity().getEStructuralFeatures().get(8);

 	}

@@ -3747,6 +4063,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAssociatedEntity_NullFlavor() {

 		return (EAttribute) getAssociatedEntity().getEStructuralFeatures().get(10);

 	}

@@ -3756,6 +4073,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAssociatedEntity_ClassCode() {

 		return (EAttribute) getAssociatedEntity().getEStructuralFeatures().get(11);

 	}

@@ -3765,6 +4083,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getInFulfillmentOf() {

 		if (inFulfillmentOfEClass == null) {

 			inFulfillmentOfEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3778,6 +4097,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInFulfillmentOf_RealmCode() {

 		return (EReference) getInFulfillmentOf().getEStructuralFeatures().get(0);

 	}

@@ -3787,6 +4107,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInFulfillmentOf_TypeId() {

 		return (EReference) getInFulfillmentOf().getEStructuralFeatures().get(1);

 	}

@@ -3796,6 +4117,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInFulfillmentOf_TemplateId() {

 		return (EReference) getInFulfillmentOf().getEStructuralFeatures().get(2);

 	}

@@ -3805,6 +4127,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInFulfillmentOf_Order() {

 		return (EReference) getInFulfillmentOf().getEStructuralFeatures().get(3);

 	}

@@ -3814,6 +4137,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInFulfillmentOf_NullFlavor() {

 		return (EAttribute) getInFulfillmentOf().getEStructuralFeatures().get(4);

 	}

@@ -3823,6 +4147,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInFulfillmentOf_TypeCode() {

 		return (EAttribute) getInFulfillmentOf().getEStructuralFeatures().get(5);

 	}

@@ -3832,6 +4157,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getOrder() {

 		if (orderEClass == null) {

 			orderEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(31);

@@ -3844,6 +4170,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrder_RealmCode() {

 		return (EReference) getOrder().getEStructuralFeatures().get(0);

 	}

@@ -3853,6 +4180,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrder_TypeId() {

 		return (EReference) getOrder().getEStructuralFeatures().get(1);

 	}

@@ -3862,6 +4190,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrder_TemplateId() {

 		return (EReference) getOrder().getEStructuralFeatures().get(2);

 	}

@@ -3871,6 +4200,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrder_Id() {

 		return (EReference) getOrder().getEStructuralFeatures().get(3);

 	}

@@ -3880,6 +4210,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrder_Code() {

 		return (EReference) getOrder().getEStructuralFeatures().get(4);

 	}

@@ -3889,6 +4220,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrder_PriorityCode() {

 		return (EReference) getOrder().getEStructuralFeatures().get(5);

 	}

@@ -3898,6 +4230,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrder_NullFlavor() {

 		return (EAttribute) getOrder().getEStructuralFeatures().get(6);

 	}

@@ -3907,6 +4240,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrder_ClassCode() {

 		return (EAttribute) getOrder().getEStructuralFeatures().get(7);

 	}

@@ -3916,6 +4250,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrder_MoodCode() {

 		return (EAttribute) getOrder().getEStructuralFeatures().get(8);

 	}

@@ -3925,6 +4260,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getDocumentationOf() {

 		if (documentationOfEClass == null) {

 			documentationOfEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -3938,6 +4274,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDocumentationOf_RealmCode() {

 		return (EReference) getDocumentationOf().getEStructuralFeatures().get(0);

 	}

@@ -3947,6 +4284,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDocumentationOf_TypeId() {

 		return (EReference) getDocumentationOf().getEStructuralFeatures().get(1);

 	}

@@ -3956,6 +4294,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDocumentationOf_TemplateId() {

 		return (EReference) getDocumentationOf().getEStructuralFeatures().get(2);

 	}

@@ -3965,6 +4304,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDocumentationOf_ServiceEvent() {

 		return (EReference) getDocumentationOf().getEStructuralFeatures().get(3);

 	}

@@ -3974,6 +4314,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDocumentationOf_NullFlavor() {

 		return (EAttribute) getDocumentationOf().getEStructuralFeatures().get(4);

 	}

@@ -3983,6 +4324,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDocumentationOf_TypeCode() {

 		return (EAttribute) getDocumentationOf().getEStructuralFeatures().get(5);

 	}

@@ -3992,6 +4334,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getServiceEvent() {

 		if (serviceEventEClass == null) {

 			serviceEventEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4005,6 +4348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getServiceEvent_RealmCode() {

 		return (EReference) getServiceEvent().getEStructuralFeatures().get(0);

 	}

@@ -4014,6 +4358,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getServiceEvent_TypeId() {

 		return (EReference) getServiceEvent().getEStructuralFeatures().get(1);

 	}

@@ -4023,6 +4368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getServiceEvent_TemplateId() {

 		return (EReference) getServiceEvent().getEStructuralFeatures().get(2);

 	}

@@ -4032,6 +4378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getServiceEvent_Id() {

 		return (EReference) getServiceEvent().getEStructuralFeatures().get(3);

 	}

@@ -4041,6 +4388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getServiceEvent_Code() {

 		return (EReference) getServiceEvent().getEStructuralFeatures().get(4);

 	}

@@ -4050,6 +4398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getServiceEvent_EffectiveTime() {

 		return (EReference) getServiceEvent().getEStructuralFeatures().get(5);

 	}

@@ -4059,6 +4408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getServiceEvent_Performer() {

 		return (EReference) getServiceEvent().getEStructuralFeatures().get(6);

 	}

@@ -4068,6 +4418,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getServiceEvent_NullFlavor() {

 		return (EAttribute) getServiceEvent().getEStructuralFeatures().get(7);

 	}

@@ -4077,6 +4428,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getServiceEvent_ClassCode() {

 		return (EAttribute) getServiceEvent().getEStructuralFeatures().get(8);

 	}

@@ -4086,6 +4438,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getServiceEvent_MoodCode() {

 		return (EAttribute) getServiceEvent().getEStructuralFeatures().get(9);

 	}

@@ -4095,6 +4448,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getPerformer1() {

 		if (performer1EClass == null) {

 			performer1EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4108,6 +4462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer1_RealmCode() {

 		return (EReference) getPerformer1().getEStructuralFeatures().get(0);

 	}

@@ -4117,6 +4472,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer1_TypeId() {

 		return (EReference) getPerformer1().getEStructuralFeatures().get(1);

 	}

@@ -4126,6 +4482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer1_TemplateId() {

 		return (EReference) getPerformer1().getEStructuralFeatures().get(2);

 	}

@@ -4135,6 +4492,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer1_FunctionCode() {

 		return (EReference) getPerformer1().getEStructuralFeatures().get(3);

 	}

@@ -4144,6 +4502,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer1_Time() {

 		return (EReference) getPerformer1().getEStructuralFeatures().get(4);

 	}

@@ -4153,6 +4512,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer1_AssignedEntity() {

 		return (EReference) getPerformer1().getEStructuralFeatures().get(5);

 	}

@@ -4162,6 +4522,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPerformer1_NullFlavor() {

 		return (EAttribute) getPerformer1().getEStructuralFeatures().get(6);

 	}

@@ -4171,6 +4532,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPerformer1_TypeCode() {

 		return (EAttribute) getPerformer1().getEStructuralFeatures().get(7);

 	}

@@ -4180,6 +4542,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getRelatedDocument() {

 		if (relatedDocumentEClass == null) {

 			relatedDocumentEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4193,6 +4556,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedDocument_RealmCode() {

 		return (EReference) getRelatedDocument().getEStructuralFeatures().get(0);

 	}

@@ -4202,6 +4566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedDocument_TypeId() {

 		return (EReference) getRelatedDocument().getEStructuralFeatures().get(1);

 	}

@@ -4211,6 +4576,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedDocument_TemplateId() {

 		return (EReference) getRelatedDocument().getEStructuralFeatures().get(2);

 	}

@@ -4220,6 +4586,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedDocument_ParentDocument() {

 		return (EReference) getRelatedDocument().getEStructuralFeatures().get(3);

 	}

@@ -4229,6 +4596,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRelatedDocument_NullFlavor() {

 		return (EAttribute) getRelatedDocument().getEStructuralFeatures().get(4);

 	}

@@ -4238,6 +4606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRelatedDocument_TypeCode() {

 		return (EAttribute) getRelatedDocument().getEStructuralFeatures().get(5);

 	}

@@ -4247,6 +4616,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getParentDocument() {

 		if (parentDocumentEClass == null) {

 			parentDocumentEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4260,6 +4630,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParentDocument_RealmCode() {

 		return (EReference) getParentDocument().getEStructuralFeatures().get(0);

 	}

@@ -4269,6 +4640,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParentDocument_TypeId() {

 		return (EReference) getParentDocument().getEStructuralFeatures().get(1);

 	}

@@ -4278,6 +4650,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParentDocument_TemplateId() {

 		return (EReference) getParentDocument().getEStructuralFeatures().get(2);

 	}

@@ -4287,6 +4660,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParentDocument_Id() {

 		return (EReference) getParentDocument().getEStructuralFeatures().get(3);

 	}

@@ -4296,6 +4670,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParentDocument_Code() {

 		return (EReference) getParentDocument().getEStructuralFeatures().get(4);

 	}

@@ -4305,6 +4680,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParentDocument_Text() {

 		return (EReference) getParentDocument().getEStructuralFeatures().get(5);

 	}

@@ -4314,6 +4690,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParentDocument_SetId() {

 		return (EReference) getParentDocument().getEStructuralFeatures().get(6);

 	}

@@ -4323,6 +4700,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParentDocument_VersionNumber() {

 		return (EReference) getParentDocument().getEStructuralFeatures().get(7);

 	}

@@ -4332,6 +4710,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParentDocument_NullFlavor() {

 		return (EAttribute) getParentDocument().getEStructuralFeatures().get(8);

 	}

@@ -4341,6 +4720,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParentDocument_ClassCode() {

 		return (EAttribute) getParentDocument().getEStructuralFeatures().get(9);

 	}

@@ -4350,6 +4730,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParentDocument_MoodCode() {

 		return (EAttribute) getParentDocument().getEStructuralFeatures().get(10);

 	}

@@ -4359,6 +4740,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAuthorization() {

 		if (authorizationEClass == null) {

 			authorizationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4372,6 +4754,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthorization_RealmCode() {

 		return (EReference) getAuthorization().getEStructuralFeatures().get(0);

 	}

@@ -4381,6 +4764,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthorization_TypeId() {

 		return (EReference) getAuthorization().getEStructuralFeatures().get(1);

 	}

@@ -4390,6 +4774,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthorization_TemplateId() {

 		return (EReference) getAuthorization().getEStructuralFeatures().get(2);

 	}

@@ -4399,6 +4784,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAuthorization_Consent() {

 		return (EReference) getAuthorization().getEStructuralFeatures().get(3);

 	}

@@ -4408,6 +4794,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthorization_NullFlavor() {

 		return (EAttribute) getAuthorization().getEStructuralFeatures().get(4);

 	}

@@ -4417,6 +4804,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAuthorization_TypeCode() {

 		return (EAttribute) getAuthorization().getEStructuralFeatures().get(5);

 	}

@@ -4426,6 +4814,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getConsent() {

 		if (consentEClass == null) {

 			consentEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -4439,6 +4828,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsent_RealmCode() {

 		return (EReference) getConsent().getEStructuralFeatures().get(0);

 	}

@@ -4448,6 +4838,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsent_TypeId() {

 		return (EReference) getConsent().getEStructuralFeatures().get(1);

 	}

@@ -4457,6 +4848,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsent_TemplateId() {

 		return (EReference) getConsent().getEStructuralFeatures().get(2);

 	}

@@ -4466,6 +4858,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsent_Id() {

 		return (EReference) getConsent().getEStructuralFeatures().get(3);

 	}

@@ -4475,6 +4868,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsent_Code() {

 		return (EReference) getConsent().getEStructuralFeatures().get(4);

 	}

@@ -4484,6 +4878,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsent_StatusCode() {

 		return (EReference) getConsent().getEStructuralFeatures().get(5);

 	}

@@ -4493,6 +4888,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getConsent_NullFlavor() {

 		return (EAttribute) getConsent().getEStructuralFeatures().get(6);

 	}

@@ -4502,6 +4898,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getConsent_ClassCode() {

 		return (EAttribute) getConsent().getEStructuralFeatures().get(7);

 	}

@@ -4511,6 +4908,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getConsent_MoodCode() {

 		return (EAttribute) getConsent().getEStructuralFeatures().get(8);

 	}

@@ -4520,6 +4918,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getComponent1() {

 		if (component1EClass == null) {

 			component1EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4533,6 +4932,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent1_RealmCode() {

 		return (EReference) getComponent1().getEStructuralFeatures().get(0);

 	}

@@ -4542,6 +4942,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent1_TypeId() {

 		return (EReference) getComponent1().getEStructuralFeatures().get(1);

 	}

@@ -4551,6 +4952,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent1_TemplateId() {

 		return (EReference) getComponent1().getEStructuralFeatures().get(2);

 	}

@@ -4560,6 +4962,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent1_EncompassingEncounter() {

 		return (EReference) getComponent1().getEStructuralFeatures().get(3);

 	}

@@ -4569,6 +4972,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent1_NullFlavor() {

 		return (EAttribute) getComponent1().getEStructuralFeatures().get(4);

 	}

@@ -4578,6 +4982,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent1_TypeCode() {

 		return (EAttribute) getComponent1().getEStructuralFeatures().get(5);

 	}

@@ -4587,6 +4992,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getEncompassingEncounter() {

 		if (encompassingEncounterEClass == null) {

 			encompassingEncounterEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4600,6 +5006,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_RealmCode() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(0);

 	}

@@ -4609,6 +5016,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_TypeId() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(1);

 	}

@@ -4618,6 +5026,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_TemplateId() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(2);

 	}

@@ -4627,6 +5036,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_Id() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(3);

 	}

@@ -4636,6 +5046,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_Code() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(4);

 	}

@@ -4645,6 +5056,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_EffectiveTime() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(5);

 	}

@@ -4654,6 +5066,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_DischargeDispositionCode() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(6);

 	}

@@ -4663,6 +5076,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_ResponsibleParty() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(7);

 	}

@@ -4672,6 +5086,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_EncounterParticipant() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(8);

 	}

@@ -4681,6 +5096,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncompassingEncounter_Location() {

 		return (EReference) getEncompassingEncounter().getEStructuralFeatures().get(9);

 	}

@@ -4690,6 +5106,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEncompassingEncounter_NullFlavor() {

 		return (EAttribute) getEncompassingEncounter().getEStructuralFeatures().get(10);

 	}

@@ -4699,6 +5116,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEncompassingEncounter_ClassCode() {

 		return (EAttribute) getEncompassingEncounter().getEStructuralFeatures().get(11);

 	}

@@ -4708,6 +5126,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEncompassingEncounter_MoodCode() {

 		return (EAttribute) getEncompassingEncounter().getEStructuralFeatures().get(12);

 	}

@@ -4717,6 +5136,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getResponsibleParty() {

 		if (responsiblePartyEClass == null) {

 			responsiblePartyEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4730,6 +5150,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getResponsibleParty_RealmCode() {

 		return (EReference) getResponsibleParty().getEStructuralFeatures().get(0);

 	}

@@ -4739,6 +5160,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getResponsibleParty_TypeId() {

 		return (EReference) getResponsibleParty().getEStructuralFeatures().get(1);

 	}

@@ -4748,6 +5170,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getResponsibleParty_TemplateId() {

 		return (EReference) getResponsibleParty().getEStructuralFeatures().get(2);

 	}

@@ -4757,6 +5180,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getResponsibleParty_AssignedEntity() {

 		return (EReference) getResponsibleParty().getEStructuralFeatures().get(3);

 	}

@@ -4766,6 +5190,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getResponsibleParty_NullFlavor() {

 		return (EAttribute) getResponsibleParty().getEStructuralFeatures().get(4);

 	}

@@ -4775,6 +5200,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getResponsibleParty_TypeCode() {

 		return (EAttribute) getResponsibleParty().getEStructuralFeatures().get(5);

 	}

@@ -4784,6 +5210,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getEncounterParticipant() {

 		if (encounterParticipantEClass == null) {

 			encounterParticipantEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4797,6 +5224,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounterParticipant_RealmCode() {

 		return (EReference) getEncounterParticipant().getEStructuralFeatures().get(0);

 	}

@@ -4806,6 +5234,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounterParticipant_TypeId() {

 		return (EReference) getEncounterParticipant().getEStructuralFeatures().get(1);

 	}

@@ -4815,6 +5244,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounterParticipant_TemplateId() {

 		return (EReference) getEncounterParticipant().getEStructuralFeatures().get(2);

 	}

@@ -4824,6 +5254,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounterParticipant_Time() {

 		return (EReference) getEncounterParticipant().getEStructuralFeatures().get(3);

 	}

@@ -4833,6 +5264,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounterParticipant_AssignedEntity() {

 		return (EReference) getEncounterParticipant().getEStructuralFeatures().get(4);

 	}

@@ -4842,6 +5274,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEncounterParticipant_NullFlavor() {

 		return (EAttribute) getEncounterParticipant().getEStructuralFeatures().get(5);

 	}

@@ -4851,6 +5284,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEncounterParticipant_TypeCode() {

 		return (EAttribute) getEncounterParticipant().getEStructuralFeatures().get(6);

 	}

@@ -4860,6 +5294,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getLocation() {

 		if (locationEClass == null) {

 			locationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -4873,6 +5308,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLocation_RealmCode() {

 		return (EReference) getLocation().getEStructuralFeatures().get(0);

 	}

@@ -4882,6 +5318,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLocation_TypeId() {

 		return (EReference) getLocation().getEStructuralFeatures().get(1);

 	}

@@ -4891,6 +5328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLocation_TemplateId() {

 		return (EReference) getLocation().getEStructuralFeatures().get(2);

 	}

@@ -4900,6 +5338,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLocation_HealthCareFacility() {

 		return (EReference) getLocation().getEStructuralFeatures().get(3);

 	}

@@ -4909,6 +5348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLocation_NullFlavor() {

 		return (EAttribute) getLocation().getEStructuralFeatures().get(4);

 	}

@@ -4918,6 +5358,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLocation_TypeCode() {

 		return (EAttribute) getLocation().getEStructuralFeatures().get(5);

 	}

@@ -4927,6 +5368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getHealthCareFacility() {

 		if (healthCareFacilityEClass == null) {

 			healthCareFacilityEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -4940,6 +5382,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getHealthCareFacility_RealmCode() {

 		return (EReference) getHealthCareFacility().getEStructuralFeatures().get(0);

 	}

@@ -4949,6 +5392,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getHealthCareFacility_TypeId() {

 		return (EReference) getHealthCareFacility().getEStructuralFeatures().get(1);

 	}

@@ -4958,6 +5402,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getHealthCareFacility_TemplateId() {

 		return (EReference) getHealthCareFacility().getEStructuralFeatures().get(2);

 	}

@@ -4967,6 +5412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getHealthCareFacility_Id() {

 		return (EReference) getHealthCareFacility().getEStructuralFeatures().get(3);

 	}

@@ -4976,6 +5422,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getHealthCareFacility_Code() {

 		return (EReference) getHealthCareFacility().getEStructuralFeatures().get(4);

 	}

@@ -4985,6 +5432,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getHealthCareFacility_Location() {

 		return (EReference) getHealthCareFacility().getEStructuralFeatures().get(5);

 	}

@@ -4994,6 +5442,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getHealthCareFacility_ServiceProviderOrganization() {

 		return (EReference) getHealthCareFacility().getEStructuralFeatures().get(6);

 	}

@@ -5003,6 +5452,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getHealthCareFacility_NullFlavor() {

 		return (EAttribute) getHealthCareFacility().getEStructuralFeatures().get(7);

 	}

@@ -5012,6 +5462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getHealthCareFacility_ClassCode() {

 		return (EAttribute) getHealthCareFacility().getEStructuralFeatures().get(8);

 	}

@@ -5021,6 +5472,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getComponent2() {

 		if (component2EClass == null) {

 			component2EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -5034,6 +5486,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent2_RealmCode() {

 		return (EReference) getComponent2().getEStructuralFeatures().get(0);

 	}

@@ -5043,6 +5496,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent2_TypeId() {

 		return (EReference) getComponent2().getEStructuralFeatures().get(1);

 	}

@@ -5052,6 +5506,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent2_TemplateId() {

 		return (EReference) getComponent2().getEStructuralFeatures().get(2);

 	}

@@ -5061,6 +5516,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent2_NonXMLBody() {

 		return (EReference) getComponent2().getEStructuralFeatures().get(3);

 	}

@@ -5070,6 +5526,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent2_StructuredBody() {

 		return (EReference) getComponent2().getEStructuralFeatures().get(4);

 	}

@@ -5079,6 +5536,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent2_NullFlavor() {

 		return (EAttribute) getComponent2().getEStructuralFeatures().get(5);

 	}

@@ -5088,6 +5546,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent2_TypeCode() {

 		return (EAttribute) getComponent2().getEStructuralFeatures().get(6);

 	}

@@ -5097,6 +5556,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent2_ContextConductionInd() {

 		return (EAttribute) getComponent2().getEStructuralFeatures().get(7);

 	}

@@ -5106,6 +5566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getNonXMLBody() {

 		if (nonXMLBodyEClass == null) {

 			nonXMLBodyEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -5119,6 +5580,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getNonXMLBody_RealmCode() {

 		return (EReference) getNonXMLBody().getEStructuralFeatures().get(0);

 	}

@@ -5128,6 +5590,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getNonXMLBody_TypeId() {

 		return (EReference) getNonXMLBody().getEStructuralFeatures().get(1);

 	}

@@ -5137,6 +5600,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getNonXMLBody_TemplateId() {

 		return (EReference) getNonXMLBody().getEStructuralFeatures().get(2);

 	}

@@ -5146,6 +5610,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getNonXMLBody_Text() {

 		return (EReference) getNonXMLBody().getEStructuralFeatures().get(3);

 	}

@@ -5155,6 +5620,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getNonXMLBody_ConfidentialityCode() {

 		return (EReference) getNonXMLBody().getEStructuralFeatures().get(4);

 	}

@@ -5164,6 +5630,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getNonXMLBody_LanguageCode() {

 		return (EReference) getNonXMLBody().getEStructuralFeatures().get(5);

 	}

@@ -5173,6 +5640,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getNonXMLBody_NullFlavor() {

 		return (EAttribute) getNonXMLBody().getEStructuralFeatures().get(6);

 	}

@@ -5182,6 +5650,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getNonXMLBody_ClassCode() {

 		return (EAttribute) getNonXMLBody().getEStructuralFeatures().get(7);

 	}

@@ -5191,6 +5660,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getNonXMLBody_MoodCode() {

 		return (EAttribute) getNonXMLBody().getEStructuralFeatures().get(8);

 	}

@@ -5200,6 +5670,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getStructuredBody() {

 		if (structuredBodyEClass == null) {

 			structuredBodyEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -5213,6 +5684,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getStructuredBody_RealmCode() {

 		return (EReference) getStructuredBody().getEStructuralFeatures().get(0);

 	}

@@ -5222,6 +5694,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getStructuredBody_TypeId() {

 		return (EReference) getStructuredBody().getEStructuralFeatures().get(1);

 	}

@@ -5231,6 +5704,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getStructuredBody_TemplateId() {

 		return (EReference) getStructuredBody().getEStructuralFeatures().get(2);

 	}

@@ -5240,6 +5714,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getStructuredBody_ConfidentialityCode() {

 		return (EReference) getStructuredBody().getEStructuralFeatures().get(3);

 	}

@@ -5249,6 +5724,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getStructuredBody_LanguageCode() {

 		return (EReference) getStructuredBody().getEStructuralFeatures().get(4);

 	}

@@ -5258,6 +5734,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getStructuredBody_Component() {

 		return (EReference) getStructuredBody().getEStructuralFeatures().get(5);

 	}

@@ -5267,6 +5744,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getStructuredBody_NullFlavor() {

 		return (EAttribute) getStructuredBody().getEStructuralFeatures().get(6);

 	}

@@ -5276,6 +5754,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getStructuredBody_ClassCode() {

 		return (EAttribute) getStructuredBody().getEStructuralFeatures().get(7);

 	}

@@ -5285,6 +5764,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getStructuredBody_MoodCode() {

 		return (EAttribute) getStructuredBody().getEStructuralFeatures().get(8);

 	}

@@ -5294,6 +5774,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getComponent3() {

 		if (component3EClass == null) {

 			component3EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -5307,6 +5788,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent3_RealmCode() {

 		return (EReference) getComponent3().getEStructuralFeatures().get(0);

 	}

@@ -5316,6 +5798,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent3_TypeId() {

 		return (EReference) getComponent3().getEStructuralFeatures().get(1);

 	}

@@ -5325,6 +5808,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent3_TemplateId() {

 		return (EReference) getComponent3().getEStructuralFeatures().get(2);

 	}

@@ -5334,6 +5818,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent3_Section() {

 		return (EReference) getComponent3().getEStructuralFeatures().get(3);

 	}

@@ -5343,6 +5828,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent3_NullFlavor() {

 		return (EAttribute) getComponent3().getEStructuralFeatures().get(4);

 	}

@@ -5352,6 +5838,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent3_TypeCode() {

 		return (EAttribute) getComponent3().getEStructuralFeatures().get(5);

 	}

@@ -5361,6 +5848,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent3_ContextConductionInd() {

 		return (EAttribute) getComponent3().getEStructuralFeatures().get(6);

 	}

@@ -5370,6 +5858,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getSection() {

 		if (sectionEClass == null) {

 			sectionEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -5383,6 +5872,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_RealmCode() {

 		return (EReference) getSection().getEStructuralFeatures().get(0);

 	}

@@ -5392,6 +5882,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_TypeId() {

 		return (EReference) getSection().getEStructuralFeatures().get(1);

 	}

@@ -5401,6 +5892,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_TemplateId() {

 		return (EReference) getSection().getEStructuralFeatures().get(2);

 	}

@@ -5410,6 +5902,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Id() {

 		return (EReference) getSection().getEStructuralFeatures().get(3);

 	}

@@ -5419,6 +5912,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Code() {

 		return (EReference) getSection().getEStructuralFeatures().get(4);

 	}

@@ -5428,6 +5922,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Title() {

 		return (EReference) getSection().getEStructuralFeatures().get(5);

 	}

@@ -5437,6 +5932,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Text() {

 		return (EReference) getSection().getEStructuralFeatures().get(6);

 	}

@@ -5446,6 +5942,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_ConfidentialityCode() {

 		return (EReference) getSection().getEStructuralFeatures().get(7);

 	}

@@ -5455,6 +5952,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_LanguageCode() {

 		return (EReference) getSection().getEStructuralFeatures().get(8);

 	}

@@ -5464,6 +5962,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Subject() {

 		return (EReference) getSection().getEStructuralFeatures().get(9);

 	}

@@ -5473,6 +5972,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Author() {

 		return (EReference) getSection().getEStructuralFeatures().get(10);

 	}

@@ -5482,6 +5982,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Informant() {

 		return (EReference) getSection().getEStructuralFeatures().get(11);

 	}

@@ -5491,6 +5992,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Entry() {

 		return (EReference) getSection().getEStructuralFeatures().get(12);

 	}

@@ -5500,6 +6002,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSection_Component() {

 		return (EReference) getSection().getEStructuralFeatures().get(13);

 	}

@@ -5509,6 +6012,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSection_SectionId() {

 		return (EAttribute) getSection().getEStructuralFeatures().get(14);

 	}

@@ -5518,6 +6022,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSection_NullFlavor() {

 		return (EAttribute) getSection().getEStructuralFeatures().get(15);

 	}

@@ -5527,6 +6032,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSection_ClassCode() {

 		return (EAttribute) getSection().getEStructuralFeatures().get(16);

 	}

@@ -5536,6 +6042,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSection_MoodCode() {

 		return (EAttribute) getSection().getEStructuralFeatures().get(17);

 	}

@@ -5545,6 +6052,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getStrucDocText() {

 		if (strucDocTextEClass == null) {

 			strucDocTextEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -5558,6 +6066,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getStrucDocText_Mixed() {

 		return (EAttribute) getStrucDocText().getEStructuralFeatures().get(0);

 	}

@@ -5567,6 +6076,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getStrucDocText_Any() {

 		return (EAttribute) getStrucDocText().getEStructuralFeatures().get(1);

 	}

@@ -5576,6 +6086,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getStrucDocText_ID() {

 		return (EAttribute) getStrucDocText().getEStructuralFeatures().get(2);

 	}

@@ -5585,6 +6096,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getSubject() {

 		if (subjectEClass == null) {

 			subjectEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -5598,6 +6110,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubject_RealmCode() {

 		return (EReference) getSubject().getEStructuralFeatures().get(0);

 	}

@@ -5607,6 +6120,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubject_TypeId() {

 		return (EReference) getSubject().getEStructuralFeatures().get(1);

 	}

@@ -5616,6 +6130,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubject_TemplateId() {

 		return (EReference) getSubject().getEStructuralFeatures().get(2);

 	}

@@ -5625,6 +6140,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubject_AwarenessCode() {

 		return (EReference) getSubject().getEStructuralFeatures().get(3);

 	}

@@ -5634,6 +6150,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubject_RelatedSubject() {

 		return (EReference) getSubject().getEStructuralFeatures().get(4);

 	}

@@ -5643,6 +6160,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubject_NullFlavor() {

 		return (EAttribute) getSubject().getEStructuralFeatures().get(5);

 	}

@@ -5652,6 +6170,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubject_TypeCode() {

 		return (EAttribute) getSubject().getEStructuralFeatures().get(6);

 	}

@@ -5661,6 +6180,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubject_ContextControlCode() {

 		return (EAttribute) getSubject().getEStructuralFeatures().get(7);

 	}

@@ -5670,6 +6190,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getRelatedSubject() {

 		if (relatedSubjectEClass == null) {

 			relatedSubjectEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -5683,6 +6204,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedSubject_RealmCode() {

 		return (EReference) getRelatedSubject().getEStructuralFeatures().get(0);

 	}

@@ -5692,6 +6214,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedSubject_TypeId() {

 		return (EReference) getRelatedSubject().getEStructuralFeatures().get(1);

 	}

@@ -5701,6 +6224,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedSubject_TemplateId() {

 		return (EReference) getRelatedSubject().getEStructuralFeatures().get(2);

 	}

@@ -5710,6 +6234,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedSubject_Id() {

 		return (EReference) getRelatedSubject().getEStructuralFeatures().get(3);

 	}

@@ -5719,6 +6244,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedSubject_Code() {

 		return (EReference) getRelatedSubject().getEStructuralFeatures().get(4);

 	}

@@ -5728,6 +6254,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedSubject_Addr() {

 		return (EReference) getRelatedSubject().getEStructuralFeatures().get(5);

 	}

@@ -5737,6 +6264,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedSubject_Telecom() {

 		return (EReference) getRelatedSubject().getEStructuralFeatures().get(6);

 	}

@@ -5746,6 +6274,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRelatedSubject_Subject() {

 		return (EReference) getRelatedSubject().getEStructuralFeatures().get(7);

 	}

@@ -5755,6 +6284,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRelatedSubject_NullFlavor() {

 		return (EAttribute) getRelatedSubject().getEStructuralFeatures().get(8);

 	}

@@ -5764,6 +6294,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRelatedSubject_ClassCode() {

 		return (EAttribute) getRelatedSubject().getEStructuralFeatures().get(9);

 	}

@@ -5773,6 +6304,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getSubjectPerson() {

 		if (subjectPersonEClass == null) {

 			subjectPersonEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -5786,6 +6318,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_RealmCode() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(0);

 	}

@@ -5795,6 +6328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_TypeId() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(1);

 	}

@@ -5804,6 +6338,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_TemplateId() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(2);

 	}

@@ -5813,6 +6348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_SDTCId() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(3);

 	}

@@ -5822,6 +6358,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_Name() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(4);

 	}

@@ -5831,6 +6368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_SDTCDesc() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(5);

 	}

@@ -5840,6 +6378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_AdministrativeGenderCode() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(6);

 	}

@@ -5849,6 +6388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_BirthTime() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(7);

 	}

@@ -5858,6 +6398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_SDTCDeceasedInd() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(8);

 	}

@@ -5867,6 +6408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_SDTCDeceasedTime() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(9);

 	}

@@ -5876,6 +6418,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_SDTCMultipleBirthInd() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(10);

 	}

@@ -5885,6 +6428,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_SDTCMultipleBirthOrderNumber() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(11);

 	}

@@ -5894,6 +6438,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_SDTCRaceCode() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(12);

 	}

@@ -5903,6 +6448,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubjectPerson_NullFlavor() {

 		return (EAttribute) getSubjectPerson().getEStructuralFeatures().get(14);

 	}

@@ -5912,6 +6458,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubjectPerson_ClassCode() {

 		return (EAttribute) getSubjectPerson().getEStructuralFeatures().get(15);

 	}

@@ -5921,6 +6468,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubjectPerson_DeterminerCode() {

 		return (EAttribute) getSubjectPerson().getEStructuralFeatures().get(16);

 	}

@@ -5930,6 +6478,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubjectPerson_SDTCEthnicGroupCode() {

 		return (EReference) getSubjectPerson().getEStructuralFeatures().get(13);

 	}

@@ -5939,6 +6488,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getEntry() {

 		if (entryEClass == null) {

 			entryEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(54);

@@ -5951,6 +6501,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_RealmCode() {

 		return (EReference) getEntry().getEStructuralFeatures().get(0);

 	}

@@ -5960,6 +6511,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_TypeId() {

 		return (EReference) getEntry().getEStructuralFeatures().get(1);

 	}

@@ -5969,6 +6521,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_TemplateId() {

 		return (EReference) getEntry().getEStructuralFeatures().get(2);

 	}

@@ -5978,6 +6531,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_Act() {

 		return (EReference) getEntry().getEStructuralFeatures().get(3);

 	}

@@ -5987,6 +6541,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_Encounter() {

 		return (EReference) getEntry().getEStructuralFeatures().get(4);

 	}

@@ -5996,6 +6551,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_Observation() {

 		return (EReference) getEntry().getEStructuralFeatures().get(5);

 	}

@@ -6005,6 +6561,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_ObservationMedia() {

 		return (EReference) getEntry().getEStructuralFeatures().get(6);

 	}

@@ -6014,6 +6571,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_Organizer() {

 		return (EReference) getEntry().getEStructuralFeatures().get(7);

 	}

@@ -6023,6 +6581,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_Procedure() {

 		return (EReference) getEntry().getEStructuralFeatures().get(8);

 	}

@@ -6032,6 +6591,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_RegionOfInterest() {

 		return (EReference) getEntry().getEStructuralFeatures().get(9);

 	}

@@ -6041,6 +6601,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_SubstanceAdministration() {

 		return (EReference) getEntry().getEStructuralFeatures().get(10);

 	}

@@ -6050,6 +6611,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntry_Supply() {

 		return (EReference) getEntry().getEStructuralFeatures().get(11);

 	}

@@ -6059,6 +6621,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntry_NullFlavor() {

 		return (EAttribute) getEntry().getEStructuralFeatures().get(12);

 	}

@@ -6068,6 +6631,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntry_TypeCode() {

 		return (EAttribute) getEntry().getEStructuralFeatures().get(13);

 	}

@@ -6077,6 +6641,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntry_ContextConductionInd() {

 		return (EAttribute) getEntry().getEStructuralFeatures().get(14);

 	}

@@ -6086,6 +6651,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getAct() {

 		if (actEClass == null) {

 			actEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(55);

@@ -6098,6 +6664,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_RealmCode() {

 		return (EReference) getAct().getEStructuralFeatures().get(0);

 	}

@@ -6107,6 +6674,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_TypeId() {

 		return (EReference) getAct().getEStructuralFeatures().get(1);

 	}

@@ -6116,6 +6684,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_TemplateId() {

 		return (EReference) getAct().getEStructuralFeatures().get(2);

 	}

@@ -6125,6 +6694,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Id() {

 		return (EReference) getAct().getEStructuralFeatures().get(3);

 	}

@@ -6134,6 +6704,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Code() {

 		return (EReference) getAct().getEStructuralFeatures().get(4);

 	}

@@ -6143,6 +6714,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Text() {

 		return (EReference) getAct().getEStructuralFeatures().get(5);

 	}

@@ -6152,6 +6724,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_StatusCode() {

 		return (EReference) getAct().getEStructuralFeatures().get(6);

 	}

@@ -6161,6 +6734,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_EffectiveTime() {

 		return (EReference) getAct().getEStructuralFeatures().get(7);

 	}

@@ -6170,6 +6744,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_PriorityCode() {

 		return (EReference) getAct().getEStructuralFeatures().get(8);

 	}

@@ -6179,6 +6754,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_LanguageCode() {

 		return (EReference) getAct().getEStructuralFeatures().get(9);

 	}

@@ -6188,6 +6764,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Subject() {

 		return (EReference) getAct().getEStructuralFeatures().get(10);

 	}

@@ -6197,6 +6774,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Specimen() {

 		return (EReference) getAct().getEStructuralFeatures().get(11);

 	}

@@ -6206,6 +6784,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Performer() {

 		return (EReference) getAct().getEStructuralFeatures().get(12);

 	}

@@ -6215,6 +6794,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Author() {

 		return (EReference) getAct().getEStructuralFeatures().get(13);

 	}

@@ -6224,6 +6804,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Informant() {

 		return (EReference) getAct().getEStructuralFeatures().get(14);

 	}

@@ -6233,6 +6814,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Participant() {

 		return (EReference) getAct().getEStructuralFeatures().get(15);

 	}

@@ -6242,6 +6824,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_EntryRelationship() {

 		return (EReference) getAct().getEStructuralFeatures().get(16);

 	}

@@ -6251,6 +6834,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Reference() {

 		return (EReference) getAct().getEStructuralFeatures().get(17);

 	}

@@ -6260,6 +6844,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_Precondition() {

 		return (EReference) getAct().getEStructuralFeatures().get(18);

 	}

@@ -6269,6 +6854,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAct_NullFlavor() {

 		return (EAttribute) getAct().getEStructuralFeatures().get(19);

 	}

@@ -6278,6 +6864,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getAct_InFulfillmentOf1() {

 		return (EReference) getAct().getEStructuralFeatures().get(20);

 	}

@@ -6287,6 +6874,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAct_ClassCode() {

 		return (EAttribute) getAct().getEStructuralFeatures().get(21);

 	}

@@ -6296,6 +6884,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAct_MoodCode() {

 		return (EAttribute) getAct().getEStructuralFeatures().get(22);

 	}

@@ -6305,6 +6894,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getAct_NegationInd() {

 		return (EAttribute) getAct().getEStructuralFeatures().get(23);

 	}

@@ -6314,6 +6904,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getClinicalStatement() {

 		if (clinicalStatementEClass == null) {

 			clinicalStatementEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -6327,6 +6918,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getSpecimen() {

 		if (specimenEClass == null) {

 			specimenEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -6340,6 +6932,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimen_RealmCode() {

 		return (EReference) getSpecimen().getEStructuralFeatures().get(0);

 	}

@@ -6349,6 +6942,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimen_TypeId() {

 		return (EReference) getSpecimen().getEStructuralFeatures().get(1);

 	}

@@ -6358,6 +6952,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimen_TemplateId() {

 		return (EReference) getSpecimen().getEStructuralFeatures().get(2);

 	}

@@ -6367,6 +6962,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimen_SpecimenRole() {

 		return (EReference) getSpecimen().getEStructuralFeatures().get(3);

 	}

@@ -6376,6 +6972,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSpecimen_NullFlavor() {

 		return (EAttribute) getSpecimen().getEStructuralFeatures().get(4);

 	}

@@ -6385,6 +6982,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSpecimen_TypeCode() {

 		return (EAttribute) getSpecimen().getEStructuralFeatures().get(5);

 	}

@@ -6394,6 +6992,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getSpecimenRole() {

 		if (specimenRoleEClass == null) {

 			specimenRoleEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -6407,6 +7006,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimenRole_RealmCode() {

 		return (EReference) getSpecimenRole().getEStructuralFeatures().get(0);

 	}

@@ -6416,6 +7016,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimenRole_TypeId() {

 		return (EReference) getSpecimenRole().getEStructuralFeatures().get(1);

 	}

@@ -6425,6 +7026,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimenRole_TemplateId() {

 		return (EReference) getSpecimenRole().getEStructuralFeatures().get(2);

 	}

@@ -6434,6 +7036,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimenRole_Id() {

 		return (EReference) getSpecimenRole().getEStructuralFeatures().get(3);

 	}

@@ -6443,6 +7046,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSpecimenRole_SpecimenPlayingEntity() {

 		return (EReference) getSpecimenRole().getEStructuralFeatures().get(4);

 	}

@@ -6452,6 +7056,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSpecimenRole_NullFlavor() {

 		return (EAttribute) getSpecimenRole().getEStructuralFeatures().get(5);

 	}

@@ -6461,6 +7066,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSpecimenRole_ClassCode() {

 		return (EAttribute) getSpecimenRole().getEStructuralFeatures().get(6);

 	}

@@ -6470,6 +7076,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getPlayingEntity() {

 		if (playingEntityEClass == null) {

 			playingEntityEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -6483,6 +7090,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlayingEntity_RealmCode() {

 		return (EReference) getPlayingEntity().getEStructuralFeatures().get(0);

 	}

@@ -6492,6 +7100,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlayingEntity_TypeId() {

 		return (EReference) getPlayingEntity().getEStructuralFeatures().get(1);

 	}

@@ -6501,6 +7110,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlayingEntity_TemplateId() {

 		return (EReference) getPlayingEntity().getEStructuralFeatures().get(2);

 	}

@@ -6510,6 +7120,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlayingEntity_Code() {

 		return (EReference) getPlayingEntity().getEStructuralFeatures().get(3);

 	}

@@ -6519,6 +7130,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlayingEntity_Quantity() {

 		return (EReference) getPlayingEntity().getEStructuralFeatures().get(4);

 	}

@@ -6528,6 +7140,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlayingEntity_Name() {

 		return (EReference) getPlayingEntity().getEStructuralFeatures().get(5);

 	}

@@ -6537,6 +7150,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlayingEntity_SDTCBirthTime() {

 		return (EReference) getPlayingEntity().getEStructuralFeatures().get(6);

 	}

@@ -6546,6 +7160,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPlayingEntity_Desc() {

 		return (EReference) getPlayingEntity().getEStructuralFeatures().get(7);

 	}

@@ -6555,6 +7170,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPlayingEntity_NullFlavor() {

 		return (EAttribute) getPlayingEntity().getEStructuralFeatures().get(8);

 	}

@@ -6564,6 +7180,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPlayingEntity_ClassCode() {

 		return (EAttribute) getPlayingEntity().getEStructuralFeatures().get(9);

 	}

@@ -6573,6 +7190,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPlayingEntity_DeterminerCode() {

 		return (EAttribute) getPlayingEntity().getEStructuralFeatures().get(10);

 	}

@@ -6582,6 +7200,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getPerformer2() {

 		if (performer2EClass == null) {

 			performer2EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -6595,6 +7214,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer2_RealmCode() {

 		return (EReference) getPerformer2().getEStructuralFeatures().get(0);

 	}

@@ -6604,6 +7224,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer2_TypeId() {

 		return (EReference) getPerformer2().getEStructuralFeatures().get(1);

 	}

@@ -6613,6 +7234,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer2_TemplateId() {

 		return (EReference) getPerformer2().getEStructuralFeatures().get(2);

 	}

@@ -6622,16 +7244,8 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPerformer2_Time() {

-		return (EReference) getPerformer2().getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getPerformer2_ModeCode() {

 		return (EReference) getPerformer2().getEStructuralFeatures().get(4);

 	}

 

@@ -6640,7 +7254,8 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getPerformer2_AssignedEntity() {

+	@Override

+	public EReference getPerformer2_ModeCode() {

 		return (EReference) getPerformer2().getEStructuralFeatures().get(5);

 	}

 

@@ -6649,8 +7264,9 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPerformer2_NullFlavor() {

-		return (EAttribute) getPerformer2().getEStructuralFeatures().get(6);

+	@Override

+	public EReference getPerformer2_AssignedEntity() {

+		return (EReference) getPerformer2().getEStructuralFeatures().get(6);

 	}

 

 	/**

@@ -6658,7 +7274,8 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getPerformer2_TypeCode() {

+	@Override

+	public EAttribute getPerformer2_NullFlavor() {

 		return (EAttribute) getPerformer2().getEStructuralFeatures().get(7);

 	}

 

@@ -6667,8 +7284,9 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getPerformer2_SDTCFunctionCode() {

-		return (EReference) getPerformer2().getEStructuralFeatures().get(8);

+	@Override

+	public EAttribute getPerformer2_TypeCode() {

+		return (EAttribute) getPerformer2().getEStructuralFeatures().get(8);

 	}

 

 	/**

@@ -6676,6 +7294,17 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

+	public EReference getPerformer2_SDTCFunctionCode() {

+		return (EReference) getPerformer2().getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

 	public EClass getParticipant2() {

 		if (participant2EClass == null) {

 			participant2EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -6689,6 +7318,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant2_RealmCode() {

 		return (EReference) getParticipant2().getEStructuralFeatures().get(0);

 	}

@@ -6698,6 +7328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant2_TypeId() {

 		return (EReference) getParticipant2().getEStructuralFeatures().get(1);

 	}

@@ -6707,6 +7338,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant2_TemplateId() {

 		return (EReference) getParticipant2().getEStructuralFeatures().get(2);

 	}

@@ -6716,6 +7348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant2_Time() {

 		return (EReference) getParticipant2().getEStructuralFeatures().get(3);

 	}

@@ -6725,6 +7358,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant2_AwarenessCode() {

 		return (EReference) getParticipant2().getEStructuralFeatures().get(4);

 	}

@@ -6734,6 +7368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant2_ParticipantRole() {

 		return (EReference) getParticipant2().getEStructuralFeatures().get(5);

 	}

@@ -6743,6 +7378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParticipant2_NullFlavor() {

 		return (EAttribute) getParticipant2().getEStructuralFeatures().get(6);

 	}

@@ -6752,6 +7388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParticipant2_TypeCode() {

 		return (EAttribute) getParticipant2().getEStructuralFeatures().get(7);

 	}

@@ -6761,6 +7398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParticipant2_ContextControlCode() {

 		return (EAttribute) getParticipant2().getEStructuralFeatures().get(8);

 	}

@@ -6770,6 +7408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipant2_SDTCFunctionCode() {

 		return (EReference) getParticipant2().getEStructuralFeatures().get(9);

 	}

@@ -6779,6 +7418,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getParticipantRole() {

 		if (participantRoleEClass == null) {

 			participantRoleEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -6792,6 +7432,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_RealmCode() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(0);

 	}

@@ -6801,6 +7442,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_TypeId() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(1);

 	}

@@ -6810,6 +7452,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_TemplateId() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(2);

 	}

@@ -6819,6 +7462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_Id() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(3);

 	}

@@ -6828,6 +7472,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_Code() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(4);

 	}

@@ -6837,6 +7482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_Addr() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(5);

 	}

@@ -6846,6 +7492,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_Telecom() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(6);

 	}

@@ -6855,6 +7502,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_PlayingDevice() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(7);

 	}

@@ -6864,6 +7512,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_PlayingEntity() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(8);

 	}

@@ -6873,6 +7522,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getParticipantRole_ScopingEntity() {

 		return (EReference) getParticipantRole().getEStructuralFeatures().get(9);

 	}

@@ -6882,6 +7532,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParticipantRole_NullFlavor() {

 		return (EAttribute) getParticipantRole().getEStructuralFeatures().get(10);

 	}

@@ -6891,6 +7542,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getParticipantRole_ClassCode() {

 		return (EAttribute) getParticipantRole().getEStructuralFeatures().get(11);

 	}

@@ -6900,6 +7552,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getDevice() {

 		if (deviceEClass == null) {

 			deviceEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -6913,6 +7566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDevice_RealmCode() {

 		return (EReference) getDevice().getEStructuralFeatures().get(0);

 	}

@@ -6922,6 +7576,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDevice_TypeId() {

 		return (EReference) getDevice().getEStructuralFeatures().get(1);

 	}

@@ -6931,6 +7586,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDevice_TemplateId() {

 		return (EReference) getDevice().getEStructuralFeatures().get(2);

 	}

@@ -6940,6 +7596,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDevice_Code() {

 		return (EReference) getDevice().getEStructuralFeatures().get(3);

 	}

@@ -6949,6 +7606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDevice_ManufacturerModelName() {

 		return (EReference) getDevice().getEStructuralFeatures().get(4);

 	}

@@ -6958,6 +7616,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDevice_SoftwareName() {

 		return (EReference) getDevice().getEStructuralFeatures().get(5);

 	}

@@ -6967,6 +7626,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDevice_NullFlavor() {

 		return (EAttribute) getDevice().getEStructuralFeatures().get(6);

 	}

@@ -6976,6 +7636,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDevice_ClassCode() {

 		return (EAttribute) getDevice().getEStructuralFeatures().get(7);

 	}

@@ -6985,6 +7646,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDevice_DeterminerCode() {

 		return (EAttribute) getDevice().getEStructuralFeatures().get(8);

 	}

@@ -6994,6 +7656,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getEntity() {

 		if (entityEClass == null) {

 			entityEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -7007,6 +7670,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntity_RealmCode() {

 		return (EReference) getEntity().getEStructuralFeatures().get(0);

 	}

@@ -7016,6 +7680,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntity_TypeId() {

 		return (EReference) getEntity().getEStructuralFeatures().get(1);

 	}

@@ -7025,6 +7690,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntity_TemplateId() {

 		return (EReference) getEntity().getEStructuralFeatures().get(2);

 	}

@@ -7034,6 +7700,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntity_Id() {

 		return (EReference) getEntity().getEStructuralFeatures().get(3);

 	}

@@ -7043,6 +7710,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntity_Code() {

 		return (EReference) getEntity().getEStructuralFeatures().get(4);

 	}

@@ -7052,6 +7720,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntity_Desc() {

 		return (EReference) getEntity().getEStructuralFeatures().get(5);

 	}

@@ -7061,6 +7730,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntity_NullFlavor() {

 		return (EAttribute) getEntity().getEStructuralFeatures().get(6);

 	}

@@ -7070,6 +7740,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntity_ClassCode() {

 		return (EAttribute) getEntity().getEStructuralFeatures().get(7);

 	}

@@ -7079,6 +7750,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntity_DeterminerCode() {

 		return (EAttribute) getEntity().getEStructuralFeatures().get(8);

 	}

@@ -7088,6 +7760,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getEntryRelationship() {

 		if (entryRelationshipEClass == null) {

 			entryRelationshipEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -7101,6 +7774,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_RealmCode() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(0);

 	}

@@ -7110,6 +7784,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_TypeId() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(1);

 	}

@@ -7119,6 +7794,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_TemplateId() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(2);

 	}

@@ -7128,6 +7804,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_SequenceNumber() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(3);

 	}

@@ -7137,6 +7814,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_SeperatableInd() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(4);

 	}

@@ -7146,6 +7824,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_Act() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(5);

 	}

@@ -7155,6 +7834,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_Encounter() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(6);

 	}

@@ -7164,6 +7844,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_Observation() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(7);

 	}

@@ -7173,6 +7854,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_ObservationMedia() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(8);

 	}

@@ -7182,6 +7864,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_Organizer() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(9);

 	}

@@ -7191,6 +7874,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_Procedure() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(10);

 	}

@@ -7200,6 +7884,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_RegionOfInterest() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(11);

 	}

@@ -7209,6 +7894,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_SubstanceAdministration() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(12);

 	}

@@ -7218,6 +7904,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEntryRelationship_Supply() {

 		return (EReference) getEntryRelationship().getEStructuralFeatures().get(13);

 	}

@@ -7227,6 +7914,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntryRelationship_NullFlavor() {

 		return (EAttribute) getEntryRelationship().getEStructuralFeatures().get(14);

 	}

@@ -7236,6 +7924,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntryRelationship_TypeCode() {

 		return (EAttribute) getEntryRelationship().getEStructuralFeatures().get(15);

 	}

@@ -7245,6 +7934,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntryRelationship_InversionInd() {

 		return (EAttribute) getEntryRelationship().getEStructuralFeatures().get(16);

 	}

@@ -7254,6 +7944,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntryRelationship_ContextConductionInd() {

 		return (EAttribute) getEntryRelationship().getEStructuralFeatures().get(17);

 	}

@@ -7263,6 +7954,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEntryRelationship_NegationInd() {

 		return (EAttribute) getEntryRelationship().getEStructuralFeatures().get(18);

 	}

@@ -7272,6 +7964,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getEncounter() {

 		if (encounterEClass == null) {

 			encounterEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -7285,6 +7978,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_RealmCode() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(0);

 	}

@@ -7294,6 +7988,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_TypeId() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(1);

 	}

@@ -7303,6 +7998,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_TemplateId() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(2);

 	}

@@ -7312,6 +8008,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Id() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(3);

 	}

@@ -7321,6 +8018,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Code() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(4);

 	}

@@ -7330,6 +8028,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Text() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(5);

 	}

@@ -7339,6 +8038,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_StatusCode() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(6);

 	}

@@ -7348,6 +8048,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_EffectiveTime() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(7);

 	}

@@ -7357,6 +8058,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_PriorityCode() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(9);

 	}

@@ -7366,6 +8068,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Subject() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(10);

 	}

@@ -7375,6 +8078,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Specimen() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(11);

 	}

@@ -7384,6 +8088,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Performer() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(12);

 	}

@@ -7393,6 +8098,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Author() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(13);

 	}

@@ -7402,6 +8108,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Informant() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(14);

 	}

@@ -7411,6 +8118,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Participant() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(15);

 	}

@@ -7420,6 +8128,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_EntryRelationship() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(16);

 	}

@@ -7429,6 +8138,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Reference() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(17);

 	}

@@ -7438,6 +8148,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_Precondition() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(18);

 	}

@@ -7447,6 +8158,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_InFulfillmentOf1() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(19);

 	}

@@ -7456,6 +8168,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEncounter_NullFlavor() {

 		return (EAttribute) getEncounter().getEStructuralFeatures().get(20);

 	}

@@ -7465,6 +8178,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEncounter_ClassCode() {

 		return (EAttribute) getEncounter().getEStructuralFeatures().get(21);

 	}

@@ -7474,6 +8188,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getEncounter_MoodCode() {

 		return (EAttribute) getEncounter().getEStructuralFeatures().get(22);

 	}

@@ -7483,6 +8198,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getEncounter_SDTCDischargeDispositionCode() {

 		return (EReference) getEncounter().getEStructuralFeatures().get(8);

 	}

@@ -7492,6 +8208,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getReference() {

 		if (referenceEClass == null) {

 			referenceEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -7505,6 +8222,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReference_RealmCode() {

 		return (EReference) getReference().getEStructuralFeatures().get(0);

 	}

@@ -7514,6 +8232,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReference_TypeId() {

 		return (EReference) getReference().getEStructuralFeatures().get(1);

 	}

@@ -7523,6 +8242,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReference_TemplateId() {

 		return (EReference) getReference().getEStructuralFeatures().get(2);

 	}

@@ -7532,6 +8252,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReference_SeperatableInd() {

 		return (EReference) getReference().getEStructuralFeatures().get(3);

 	}

@@ -7541,6 +8262,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReference_ExternalAct() {

 		return (EReference) getReference().getEStructuralFeatures().get(4);

 	}

@@ -7550,6 +8272,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReference_ExternalObservation() {

 		return (EReference) getReference().getEStructuralFeatures().get(5);

 	}

@@ -7559,6 +8282,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReference_ExternalProcedure() {

 		return (EReference) getReference().getEStructuralFeatures().get(6);

 	}

@@ -7568,6 +8292,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReference_ExternalDocument() {

 		return (EReference) getReference().getEStructuralFeatures().get(7);

 	}

@@ -7577,6 +8302,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getReference_NullFlavor() {

 		return (EAttribute) getReference().getEStructuralFeatures().get(8);

 	}

@@ -7586,6 +8312,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getReference_TypeCode() {

 		return (EAttribute) getReference().getEStructuralFeatures().get(9);

 	}

@@ -7595,6 +8322,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getExternalAct() {

 		if (externalActEClass == null) {

 			externalActEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -7608,6 +8336,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalAct_RealmCode() {

 		return (EReference) getExternalAct().getEStructuralFeatures().get(0);

 	}

@@ -7617,6 +8346,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalAct_TypeId() {

 		return (EReference) getExternalAct().getEStructuralFeatures().get(1);

 	}

@@ -7626,6 +8356,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalAct_TemplateId() {

 		return (EReference) getExternalAct().getEStructuralFeatures().get(2);

 	}

@@ -7635,6 +8366,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalAct_Id() {

 		return (EReference) getExternalAct().getEStructuralFeatures().get(3);

 	}

@@ -7644,6 +8376,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalAct_Code() {

 		return (EReference) getExternalAct().getEStructuralFeatures().get(4);

 	}

@@ -7653,6 +8386,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalAct_Text() {

 		return (EReference) getExternalAct().getEStructuralFeatures().get(5);

 	}

@@ -7662,6 +8396,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalAct_NullFlavor() {

 		return (EAttribute) getExternalAct().getEStructuralFeatures().get(6);

 	}

@@ -7671,6 +8406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalAct_ClassCode() {

 		return (EAttribute) getExternalAct().getEStructuralFeatures().get(7);

 	}

@@ -7680,6 +8416,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalAct_MoodCode() {

 		return (EAttribute) getExternalAct().getEStructuralFeatures().get(8);

 	}

@@ -7689,6 +8426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getExternalObservation() {

 		if (externalObservationEClass == null) {

 			externalObservationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -7702,6 +8440,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalObservation_RealmCode() {

 		return (EReference) getExternalObservation().getEStructuralFeatures().get(0);

 	}

@@ -7711,6 +8450,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalObservation_TypeId() {

 		return (EReference) getExternalObservation().getEStructuralFeatures().get(1);

 	}

@@ -7720,6 +8460,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalObservation_TemplateId() {

 		return (EReference) getExternalObservation().getEStructuralFeatures().get(2);

 	}

@@ -7729,6 +8470,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalObservation_Id() {

 		return (EReference) getExternalObservation().getEStructuralFeatures().get(3);

 	}

@@ -7738,6 +8480,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalObservation_Code() {

 		return (EReference) getExternalObservation().getEStructuralFeatures().get(4);

 	}

@@ -7747,6 +8490,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalObservation_Text() {

 		return (EReference) getExternalObservation().getEStructuralFeatures().get(5);

 	}

@@ -7756,6 +8500,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalObservation_NullFlavor() {

 		return (EAttribute) getExternalObservation().getEStructuralFeatures().get(6);

 	}

@@ -7765,6 +8510,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalObservation_ClassCode() {

 		return (EAttribute) getExternalObservation().getEStructuralFeatures().get(7);

 	}

@@ -7774,6 +8520,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalObservation_MoodCode() {

 		return (EAttribute) getExternalObservation().getEStructuralFeatures().get(8);

 	}

@@ -7783,6 +8530,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getExternalProcedure() {

 		if (externalProcedureEClass == null) {

 			externalProcedureEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -7796,6 +8544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalProcedure_RealmCode() {

 		return (EReference) getExternalProcedure().getEStructuralFeatures().get(0);

 	}

@@ -7805,6 +8554,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalProcedure_TypeId() {

 		return (EReference) getExternalProcedure().getEStructuralFeatures().get(1);

 	}

@@ -7814,6 +8564,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalProcedure_TemplateId() {

 		return (EReference) getExternalProcedure().getEStructuralFeatures().get(2);

 	}

@@ -7823,6 +8574,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalProcedure_Id() {

 		return (EReference) getExternalProcedure().getEStructuralFeatures().get(3);

 	}

@@ -7832,6 +8584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalProcedure_Code() {

 		return (EReference) getExternalProcedure().getEStructuralFeatures().get(4);

 	}

@@ -7841,6 +8594,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalProcedure_Text() {

 		return (EReference) getExternalProcedure().getEStructuralFeatures().get(5);

 	}

@@ -7850,6 +8604,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalProcedure_NullFlavor() {

 		return (EAttribute) getExternalProcedure().getEStructuralFeatures().get(6);

 	}

@@ -7859,6 +8614,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalProcedure_ClassCode() {

 		return (EAttribute) getExternalProcedure().getEStructuralFeatures().get(7);

 	}

@@ -7868,6 +8624,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalProcedure_MoodCode() {

 		return (EAttribute) getExternalProcedure().getEStructuralFeatures().get(8);

 	}

@@ -7877,6 +8634,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getExternalDocument() {

 		if (externalDocumentEClass == null) {

 			externalDocumentEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -7890,6 +8648,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalDocument_RealmCode() {

 		return (EReference) getExternalDocument().getEStructuralFeatures().get(0);

 	}

@@ -7899,6 +8658,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalDocument_TypeId() {

 		return (EReference) getExternalDocument().getEStructuralFeatures().get(1);

 	}

@@ -7908,6 +8668,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalDocument_TemplateId() {

 		return (EReference) getExternalDocument().getEStructuralFeatures().get(2);

 	}

@@ -7917,6 +8678,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalDocument_Id() {

 		return (EReference) getExternalDocument().getEStructuralFeatures().get(3);

 	}

@@ -7926,6 +8688,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalDocument_Code() {

 		return (EReference) getExternalDocument().getEStructuralFeatures().get(4);

 	}

@@ -7935,6 +8698,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalDocument_Text() {

 		return (EReference) getExternalDocument().getEStructuralFeatures().get(5);

 	}

@@ -7944,6 +8708,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalDocument_SetId() {

 		return (EReference) getExternalDocument().getEStructuralFeatures().get(6);

 	}

@@ -7953,6 +8718,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getExternalDocument_VersionNumber() {

 		return (EReference) getExternalDocument().getEStructuralFeatures().get(7);

 	}

@@ -7962,6 +8728,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalDocument_NullFlavor() {

 		return (EAttribute) getExternalDocument().getEStructuralFeatures().get(8);

 	}

@@ -7971,6 +8738,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalDocument_ClassCode() {

 		return (EAttribute) getExternalDocument().getEStructuralFeatures().get(9);

 	}

@@ -7980,6 +8748,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getExternalDocument_MoodCode() {

 		return (EAttribute) getExternalDocument().getEStructuralFeatures().get(10);

 	}

@@ -7989,6 +8758,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getPrecondition() {

 		if (preconditionEClass == null) {

 			preconditionEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -8002,6 +8772,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPrecondition_RealmCode() {

 		return (EReference) getPrecondition().getEStructuralFeatures().get(0);

 	}

@@ -8011,6 +8782,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPrecondition_TypeId() {

 		return (EReference) getPrecondition().getEStructuralFeatures().get(1);

 	}

@@ -8020,6 +8792,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPrecondition_TemplateId() {

 		return (EReference) getPrecondition().getEStructuralFeatures().get(2);

 	}

@@ -8029,6 +8802,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getPrecondition_Criterion() {

 		return (EReference) getPrecondition().getEStructuralFeatures().get(3);

 	}

@@ -8038,6 +8812,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPrecondition_NullFlavor() {

 		return (EAttribute) getPrecondition().getEStructuralFeatures().get(4);

 	}

@@ -8047,6 +8822,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getPrecondition_TypeCode() {

 		return (EAttribute) getPrecondition().getEStructuralFeatures().get(5);

 	}

@@ -8056,6 +8832,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getCriterion() {

 		if (criterionEClass == null) {

 			criterionEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -8069,6 +8846,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCriterion_RealmCode() {

 		return (EReference) getCriterion().getEStructuralFeatures().get(0);

 	}

@@ -8078,6 +8856,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCriterion_TypeId() {

 		return (EReference) getCriterion().getEStructuralFeatures().get(1);

 	}

@@ -8087,6 +8866,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCriterion_TemplateId() {

 		return (EReference) getCriterion().getEStructuralFeatures().get(2);

 	}

@@ -8096,6 +8876,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCriterion_Code() {

 		return (EReference) getCriterion().getEStructuralFeatures().get(3);

 	}

@@ -8105,6 +8886,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCriterion_Text() {

 		return (EReference) getCriterion().getEStructuralFeatures().get(4);

 	}

@@ -8114,6 +8896,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getCriterion_Value() {

 		return (EReference) getCriterion().getEStructuralFeatures().get(5);

 	}

@@ -8123,6 +8906,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getCriterion_NullFlavor() {

 		return (EAttribute) getCriterion().getEStructuralFeatures().get(6);

 	}

@@ -8132,6 +8916,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getCriterion_ClassCode() {

 		return (EAttribute) getCriterion().getEStructuralFeatures().get(7);

 	}

@@ -8141,6 +8926,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getCriterion_MoodCode() {

 		return (EAttribute) getCriterion().getEStructuralFeatures().get(8);

 	}

@@ -8150,6 +8936,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getObservation() {

 		if (observationEClass == null) {

 			observationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -8163,6 +8950,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_RealmCode() {

 		return (EReference) getObservation().getEStructuralFeatures().get(0);

 	}

@@ -8172,6 +8960,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_TypeId() {

 		return (EReference) getObservation().getEStructuralFeatures().get(1);

 	}

@@ -8181,6 +8970,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_TemplateId() {

 		return (EReference) getObservation().getEStructuralFeatures().get(2);

 	}

@@ -8190,6 +8980,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Id() {

 		return (EReference) getObservation().getEStructuralFeatures().get(3);

 	}

@@ -8199,6 +8990,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Code() {

 		return (EReference) getObservation().getEStructuralFeatures().get(4);

 	}

@@ -8208,6 +9000,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_DerivationExpr() {

 		return (EReference) getObservation().getEStructuralFeatures().get(5);

 	}

@@ -8217,6 +9010,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Text() {

 		return (EReference) getObservation().getEStructuralFeatures().get(6);

 	}

@@ -8226,6 +9020,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_StatusCode() {

 		return (EReference) getObservation().getEStructuralFeatures().get(7);

 	}

@@ -8235,6 +9030,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_EffectiveTime() {

 		return (EReference) getObservation().getEStructuralFeatures().get(8);

 	}

@@ -8244,6 +9040,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_PriorityCode() {

 		return (EReference) getObservation().getEStructuralFeatures().get(9);

 	}

@@ -8253,6 +9050,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_RepeatNumber() {

 		return (EReference) getObservation().getEStructuralFeatures().get(10);

 	}

@@ -8262,6 +9060,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_LanguageCode() {

 		return (EReference) getObservation().getEStructuralFeatures().get(11);

 	}

@@ -8271,6 +9070,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Value() {

 		return (EReference) getObservation().getEStructuralFeatures().get(12);

 	}

@@ -8280,6 +9080,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_InterpretationCode() {

 		return (EReference) getObservation().getEStructuralFeatures().get(13);

 	}

@@ -8289,6 +9090,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_MethodCode() {

 		return (EReference) getObservation().getEStructuralFeatures().get(14);

 	}

@@ -8298,6 +9100,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_TargetSiteCode() {

 		return (EReference) getObservation().getEStructuralFeatures().get(15);

 	}

@@ -8307,6 +9110,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Subject() {

 		return (EReference) getObservation().getEStructuralFeatures().get(16);

 	}

@@ -8316,6 +9120,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Specimen() {

 		return (EReference) getObservation().getEStructuralFeatures().get(17);

 	}

@@ -8325,6 +9130,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Performer() {

 		return (EReference) getObservation().getEStructuralFeatures().get(18);

 	}

@@ -8334,6 +9140,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Author() {

 		return (EReference) getObservation().getEStructuralFeatures().get(19);

 	}

@@ -8343,6 +9150,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Informant() {

 		return (EReference) getObservation().getEStructuralFeatures().get(20);

 	}

@@ -8352,6 +9160,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Participant() {

 		return (EReference) getObservation().getEStructuralFeatures().get(21);

 	}

@@ -8361,6 +9170,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_EntryRelationship() {

 		return (EReference) getObservation().getEStructuralFeatures().get(22);

 	}

@@ -8370,6 +9180,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Reference() {

 		return (EReference) getObservation().getEStructuralFeatures().get(23);

 	}

@@ -8379,6 +9190,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_Precondition() {

 		return (EReference) getObservation().getEStructuralFeatures().get(24);

 	}

@@ -8388,6 +9200,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_ReferenceRange() {

 		return (EReference) getObservation().getEStructuralFeatures().get(25);

 	}

@@ -8397,6 +9210,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservation_NullFlavor() {

 		return (EAttribute) getObservation().getEStructuralFeatures().get(26);

 	}

@@ -8406,6 +9220,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservation_ClassCode() {

 		return (EAttribute) getObservation().getEStructuralFeatures().get(27);

 	}

@@ -8415,6 +9230,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservation_MoodCode() {

 		return (EAttribute) getObservation().getEStructuralFeatures().get(28);

 	}

@@ -8424,6 +9240,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservation_NegationInd() {

 		return (EAttribute) getObservation().getEStructuralFeatures().get(29);

 	}

@@ -8433,6 +9250,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservation_InFulfillmentOf1() {

 		return (EReference) getObservation().getEStructuralFeatures().get(30);

 	}

@@ -8442,6 +9260,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getReferenceRange() {

 		if (referenceRangeEClass == null) {

 			referenceRangeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -8455,6 +9274,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReferenceRange_RealmCode() {

 		return (EReference) getReferenceRange().getEStructuralFeatures().get(0);

 	}

@@ -8464,6 +9284,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReferenceRange_TypeId() {

 		return (EReference) getReferenceRange().getEStructuralFeatures().get(1);

 	}

@@ -8473,6 +9294,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReferenceRange_TemplateId() {

 		return (EReference) getReferenceRange().getEStructuralFeatures().get(2);

 	}

@@ -8482,6 +9304,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getReferenceRange_ObservationRange() {

 		return (EReference) getReferenceRange().getEStructuralFeatures().get(3);

 	}

@@ -8491,6 +9314,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getReferenceRange_NullFlavor() {

 		return (EAttribute) getReferenceRange().getEStructuralFeatures().get(4);

 	}

@@ -8500,6 +9324,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getReferenceRange_TypeCode() {

 		return (EAttribute) getReferenceRange().getEStructuralFeatures().get(5);

 	}

@@ -8509,6 +9334,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getObservationRange() {

 		if (observationRangeEClass == null) {

 			observationRangeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -8522,6 +9348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationRange_RealmCode() {

 		return (EReference) getObservationRange().getEStructuralFeatures().get(0);

 	}

@@ -8531,6 +9358,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationRange_TypeId() {

 		return (EReference) getObservationRange().getEStructuralFeatures().get(1);

 	}

@@ -8540,6 +9368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationRange_TemplateId() {

 		return (EReference) getObservationRange().getEStructuralFeatures().get(2);

 	}

@@ -8549,6 +9378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationRange_Code() {

 		return (EReference) getObservationRange().getEStructuralFeatures().get(3);

 	}

@@ -8558,6 +9388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationRange_Text() {

 		return (EReference) getObservationRange().getEStructuralFeatures().get(4);

 	}

@@ -8567,6 +9398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationRange_Value() {

 		return (EReference) getObservationRange().getEStructuralFeatures().get(5);

 	}

@@ -8576,6 +9408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationRange_InterpretationCode() {

 		return (EReference) getObservationRange().getEStructuralFeatures().get(6);

 	}

@@ -8585,6 +9418,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservationRange_NullFlavor() {

 		return (EAttribute) getObservationRange().getEStructuralFeatures().get(7);

 	}

@@ -8594,6 +9428,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservationRange_ClassCode() {

 		return (EAttribute) getObservationRange().getEStructuralFeatures().get(8);

 	}

@@ -8603,6 +9438,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservationRange_MoodCode() {

 		return (EAttribute) getObservationRange().getEStructuralFeatures().get(9);

 	}

@@ -8612,6 +9448,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getInFulfillmentOf1() {

 		if (inFulfillmentOf1EClass == null) {

 			inFulfillmentOf1EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -8625,6 +9462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInFulfillmentOf1_RealmCode() {

 		return (EReference) getInFulfillmentOf1().getEStructuralFeatures().get(0);

 	}

@@ -8634,6 +9472,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInFulfillmentOf1_TypeId() {

 		return (EReference) getInFulfillmentOf1().getEStructuralFeatures().get(1);

 	}

@@ -8643,6 +9482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInFulfillmentOf1_TemplateId() {

 		return (EReference) getInFulfillmentOf1().getEStructuralFeatures().get(2);

 	}

@@ -8652,6 +9492,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInFulfillmentOf1_NullFlavor() {

 		return (EAttribute) getInFulfillmentOf1().getEStructuralFeatures().get(3);

 	}

@@ -8661,6 +9502,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getInFulfillmentOf1_TypeCode() {

 		return (EAttribute) getInFulfillmentOf1().getEStructuralFeatures().get(4);

 	}

@@ -8670,6 +9512,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getInFulfillmentOf1_ActReference() {

 		return (EReference) getInFulfillmentOf1().getEStructuralFeatures().get(5);

 	}

@@ -8679,6 +9522,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getActReference() {

 		if (actReferenceEClass == null) {

 			actReferenceEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -8692,6 +9536,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getActReference_RealmCode() {

 		return (EReference) getActReference().getEStructuralFeatures().get(0);

 	}

@@ -8701,6 +9546,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getActReference_TypeId() {

 		return (EReference) getActReference().getEStructuralFeatures().get(1);

 	}

@@ -8710,6 +9556,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getActReference_TemplateId() {

 		return (EReference) getActReference().getEStructuralFeatures().get(2);

 	}

@@ -8719,6 +9566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getActReference_Id() {

 		return (EReference) getActReference().getEStructuralFeatures().get(3);

 	}

@@ -8728,6 +9576,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getActReference_ClassCode() {

 		return (EAttribute) getActReference().getEStructuralFeatures().get(4);

 	}

@@ -8737,6 +9586,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getActReference_MoodCode() {

 		return (EAttribute) getActReference().getEStructuralFeatures().get(5);

 	}

@@ -8746,6 +9596,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getActReference_DeterminerCode() {

 		return (EAttribute) getActReference().getEStructuralFeatures().get(6);

 	}

@@ -8755,6 +9606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getObservationMedia() {

 		if (observationMediaEClass == null) {

 			observationMediaEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -8768,6 +9620,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_RealmCode() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(0);

 	}

@@ -8777,6 +9630,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_TypeId() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(1);

 	}

@@ -8786,6 +9640,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_TemplateId() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(2);

 	}

@@ -8795,6 +9650,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Id() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(3);

 	}

@@ -8804,6 +9660,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_LanguageCode() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(4);

 	}

@@ -8813,6 +9670,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Value() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(5);

 	}

@@ -8822,6 +9680,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Subject() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(6);

 	}

@@ -8831,6 +9690,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Specimen() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(7);

 	}

@@ -8840,6 +9700,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Performer() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(8);

 	}

@@ -8849,6 +9710,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Author() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(9);

 	}

@@ -8858,6 +9720,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Informant() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(10);

 	}

@@ -8867,6 +9730,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Participant() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(11);

 	}

@@ -8876,6 +9740,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_EntryRelationship() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(12);

 	}

@@ -8885,6 +9750,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Reference() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(13);

 	}

@@ -8894,6 +9760,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getObservationMedia_Precondition() {

 		return (EReference) getObservationMedia().getEStructuralFeatures().get(14);

 	}

@@ -8903,6 +9770,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservationMedia_ObservationMediaId() {

 		return (EAttribute) getObservationMedia().getEStructuralFeatures().get(15);

 	}

@@ -8912,6 +9780,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservationMedia_NullFlavor() {

 		return (EAttribute) getObservationMedia().getEStructuralFeatures().get(16);

 	}

@@ -8921,6 +9790,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservationMedia_ClassCode() {

 		return (EAttribute) getObservationMedia().getEStructuralFeatures().get(17);

 	}

@@ -8930,6 +9800,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getObservationMedia_MoodCode() {

 		return (EAttribute) getObservationMedia().getEStructuralFeatures().get(18);

 	}

@@ -8939,6 +9810,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getOrganizer() {

 		if (organizerEClass == null) {

 			organizerEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -8952,6 +9824,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_RealmCode() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(0);

 	}

@@ -8961,6 +9834,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_TypeId() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(1);

 	}

@@ -8970,6 +9844,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_TemplateId() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(2);

 	}

@@ -8979,6 +9854,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Id() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(3);

 	}

@@ -8988,6 +9864,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Code() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(4);

 	}

@@ -8997,6 +9874,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_StatusCode() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(5);

 	}

@@ -9006,6 +9884,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_EffectiveTime() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(6);

 	}

@@ -9015,6 +9894,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Subject() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(7);

 	}

@@ -9024,6 +9904,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Specimen() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(8);

 	}

@@ -9033,6 +9914,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Performer() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(9);

 	}

@@ -9042,6 +9924,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Author() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(10);

 	}

@@ -9051,6 +9934,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Informant() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(11);

 	}

@@ -9060,6 +9944,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Participant() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(12);

 	}

@@ -9069,6 +9954,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Reference() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(13);

 	}

@@ -9078,6 +9964,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Precondition() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(14);

 	}

@@ -9087,6 +9974,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getOrganizer_Component() {

 		return (EReference) getOrganizer().getEStructuralFeatures().get(15);

 	}

@@ -9096,6 +9984,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrganizer_NullFlavor() {

 		return (EAttribute) getOrganizer().getEStructuralFeatures().get(16);

 	}

@@ -9105,6 +9994,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrganizer_ClassCode() {

 		return (EAttribute) getOrganizer().getEStructuralFeatures().get(17);

 	}

@@ -9114,6 +10004,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getOrganizer_MoodCode() {

 		return (EAttribute) getOrganizer().getEStructuralFeatures().get(18);

 	}

@@ -9123,6 +10014,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getComponent4() {

 		if (component4EClass == null) {

 			component4EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -9136,6 +10028,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_RealmCode() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(0);

 	}

@@ -9145,6 +10038,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_TypeId() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(1);

 	}

@@ -9154,6 +10048,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_TemplateId() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(2);

 	}

@@ -9163,6 +10058,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_SequenceNumber() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(3);

 	}

@@ -9172,6 +10068,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_PriorityNumber() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(4);

 	}

@@ -9181,6 +10078,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_SeperatableInd() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(5);

 	}

@@ -9190,6 +10088,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_Act() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(6);

 	}

@@ -9199,6 +10098,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_Encounter() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(7);

 	}

@@ -9208,6 +10108,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_Observation() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(8);

 	}

@@ -9217,6 +10118,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_ObservationMedia() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(9);

 	}

@@ -9226,6 +10128,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_Organizer() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(10);

 	}

@@ -9235,6 +10138,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_Procedure() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(11);

 	}

@@ -9244,6 +10148,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_RegionOfInterest() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(12);

 	}

@@ -9253,6 +10158,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_SubstanceAdministration() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(13);

 	}

@@ -9262,6 +10168,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent4_Supply() {

 		return (EReference) getComponent4().getEStructuralFeatures().get(14);

 	}

@@ -9271,6 +10178,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent4_NullFlavor() {

 		return (EAttribute) getComponent4().getEStructuralFeatures().get(15);

 	}

@@ -9280,6 +10188,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent4_TypeCode() {

 		return (EAttribute) getComponent4().getEStructuralFeatures().get(16);

 	}

@@ -9289,6 +10198,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent4_ContextConductionInd() {

 		return (EAttribute) getComponent4().getEStructuralFeatures().get(17);

 	}

@@ -9298,6 +10208,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getProcedure() {

 		if (procedureEClass == null) {

 			procedureEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -9311,6 +10222,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_RealmCode() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(0);

 	}

@@ -9320,6 +10232,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_TypeId() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(1);

 	}

@@ -9329,6 +10242,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_TemplateId() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(2);

 	}

@@ -9338,6 +10252,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Id() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(3);

 	}

@@ -9347,6 +10262,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Code() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(4);

 	}

@@ -9356,6 +10272,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Text() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(5);

 	}

@@ -9365,6 +10282,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_StatusCode() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(6);

 	}

@@ -9374,6 +10292,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_EffectiveTime() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(7);

 	}

@@ -9383,6 +10302,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_PriorityCode() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(8);

 	}

@@ -9392,6 +10312,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_LanguageCode() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(9);

 	}

@@ -9401,6 +10322,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_MethodCode() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(10);

 	}

@@ -9410,6 +10332,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_ApproachSiteCode() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(11);

 	}

@@ -9419,6 +10342,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_TargetSiteCode() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(12);

 	}

@@ -9428,6 +10352,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Subject() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(13);

 	}

@@ -9437,6 +10362,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Specimen() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(14);

 	}

@@ -9446,6 +10372,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Performer() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(15);

 	}

@@ -9455,6 +10382,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Author() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(16);

 	}

@@ -9464,6 +10392,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Informant() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(17);

 	}

@@ -9473,6 +10402,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Participant() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(18);

 	}

@@ -9482,6 +10412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_EntryRelationship() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(19);

 	}

@@ -9491,6 +10422,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Reference() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(20);

 	}

@@ -9500,6 +10432,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_Precondition() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(21);

 	}

@@ -9509,6 +10442,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProcedure_InFulfillmentOf1() {

 		return (EReference) getProcedure().getEStructuralFeatures().get(22);

 	}

@@ -9518,6 +10452,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getProcedure_NullFlavor() {

 		return (EAttribute) getProcedure().getEStructuralFeatures().get(23);

 	}

@@ -9527,6 +10462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getProcedure_ClassCode() {

 		return (EAttribute) getProcedure().getEStructuralFeatures().get(24);

 	}

@@ -9536,6 +10472,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getProcedure_MoodCode() {

 		return (EAttribute) getProcedure().getEStructuralFeatures().get(25);

 	}

@@ -9545,6 +10482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getProcedure_NegationInd() {

 		return (EAttribute) getProcedure().getEStructuralFeatures().get(26);

 	}

@@ -9554,6 +10492,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getRegionOfInterest() {

 		if (regionOfInterestEClass == null) {

 			regionOfInterestEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -9567,6 +10506,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_RealmCode() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(0);

 	}

@@ -9576,6 +10516,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_TypeId() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(1);

 	}

@@ -9585,6 +10526,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_TemplateId() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(2);

 	}

@@ -9594,6 +10536,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Id() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(3);

 	}

@@ -9603,6 +10546,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Code() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(4);

 	}

@@ -9612,6 +10556,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Value() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(5);

 	}

@@ -9621,6 +10566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Subject() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(6);

 	}

@@ -9630,6 +10576,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Specimen() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(7);

 	}

@@ -9639,6 +10586,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Performer() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(8);

 	}

@@ -9648,6 +10596,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Author() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(9);

 	}

@@ -9657,6 +10606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Informant() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(10);

 	}

@@ -9666,6 +10616,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Participant() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(11);

 	}

@@ -9675,6 +10626,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_EntryRelationship() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(12);

 	}

@@ -9684,6 +10636,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Reference() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(13);

 	}

@@ -9693,6 +10646,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getRegionOfInterest_Precondition() {

 		return (EReference) getRegionOfInterest().getEStructuralFeatures().get(14);

 	}

@@ -9702,6 +10656,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRegionOfInterest_RegionOfInterestId() {

 		return (EAttribute) getRegionOfInterest().getEStructuralFeatures().get(15);

 	}

@@ -9711,6 +10666,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRegionOfInterest_NullFlavor() {

 		return (EAttribute) getRegionOfInterest().getEStructuralFeatures().get(16);

 	}

@@ -9720,6 +10676,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRegionOfInterest_ClassCode() {

 		return (EAttribute) getRegionOfInterest().getEStructuralFeatures().get(17);

 	}

@@ -9729,6 +10686,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRegionOfInterest_MoodCode() {

 		return (EAttribute) getRegionOfInterest().getEStructuralFeatures().get(18);

 	}

@@ -9738,6 +10696,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getRegionOfInterestValue() {

 		if (regionOfInterestValueEClass == null) {

 			regionOfInterestValueEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -9751,6 +10710,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getRegionOfInterestValue_Unsorted() {

 		return (EAttribute) getRegionOfInterestValue().getEStructuralFeatures().get(0);

 	}

@@ -9760,6 +10720,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getSubstanceAdministration() {

 		if (substanceAdministrationEClass == null) {

 			substanceAdministrationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -9773,6 +10734,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_RealmCode() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(0);

 	}

@@ -9782,6 +10744,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_TypeId() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(1);

 	}

@@ -9791,6 +10754,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_TemplateId() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(2);

 	}

@@ -9800,6 +10764,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Id() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(3);

 	}

@@ -9809,6 +10774,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Code() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(4);

 	}

@@ -9818,6 +10784,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Text() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(5);

 	}

@@ -9827,6 +10794,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_StatusCode() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(6);

 	}

@@ -9836,6 +10804,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_EffectiveTime() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(7);

 	}

@@ -9845,6 +10814,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_PriorityCode() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(8);

 	}

@@ -9854,6 +10824,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_RepeatNumber() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(9);

 	}

@@ -9863,6 +10834,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_RouteCode() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(10);

 	}

@@ -9872,6 +10844,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_ApproachSiteCode() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(11);

 	}

@@ -9881,6 +10854,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_DoseQuantity() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(12);

 	}

@@ -9890,6 +10864,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_RateQuantity() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(13);

 	}

@@ -9899,6 +10874,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_MaxDoseQuantity() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(14);

 	}

@@ -9908,6 +10884,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_AdministrationUnitCode() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(15);

 	}

@@ -9917,6 +10894,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Subject() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(16);

 	}

@@ -9926,6 +10904,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Specimen() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(17);

 	}

@@ -9935,6 +10914,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Consumable() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(18);

 	}

@@ -9944,6 +10924,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Performer() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(19);

 	}

@@ -9953,6 +10934,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Author() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(20);

 	}

@@ -9962,6 +10944,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Informant() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(21);

 	}

@@ -9971,6 +10954,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Reference() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(24);

 	}

@@ -9980,6 +10964,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Participant() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(22);

 	}

@@ -9989,6 +10974,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_EntryRelationship() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(23);

 	}

@@ -9998,6 +10984,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_Precondition() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(25);

 	}

@@ -10007,6 +10994,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSubstanceAdministration_InFulfillmentOf1() {

 		return (EReference) getSubstanceAdministration().getEStructuralFeatures().get(26);

 	}

@@ -10016,6 +11004,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubstanceAdministration_NullFlavor() {

 		return (EAttribute) getSubstanceAdministration().getEStructuralFeatures().get(27);

 	}

@@ -10025,6 +11014,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubstanceAdministration_ClassCode() {

 		return (EAttribute) getSubstanceAdministration().getEStructuralFeatures().get(28);

 	}

@@ -10034,6 +11024,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubstanceAdministration_MoodCode() {

 		return (EAttribute) getSubstanceAdministration().getEStructuralFeatures().get(29);

 	}

@@ -10043,6 +11034,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSubstanceAdministration_NegationInd() {

 		return (EAttribute) getSubstanceAdministration().getEStructuralFeatures().get(30);

 	}

@@ -10052,6 +11044,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getConsumable() {

 		if (consumableEClass == null) {

 			consumableEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -10065,6 +11058,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsumable_RealmCode() {

 		return (EReference) getConsumable().getEStructuralFeatures().get(0);

 	}

@@ -10074,6 +11068,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsumable_TypeId() {

 		return (EReference) getConsumable().getEStructuralFeatures().get(1);

 	}

@@ -10083,6 +11078,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsumable_TemplateId() {

 		return (EReference) getConsumable().getEStructuralFeatures().get(2);

 	}

@@ -10092,6 +11088,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getConsumable_ManufacturedProduct() {

 		return (EReference) getConsumable().getEStructuralFeatures().get(3);

 	}

@@ -10101,6 +11098,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getConsumable_NullFlavor() {

 		return (EAttribute) getConsumable().getEStructuralFeatures().get(4);

 	}

@@ -10110,6 +11108,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getConsumable_TypeCode() {

 		return (EAttribute) getConsumable().getEStructuralFeatures().get(5);

 	}

@@ -10119,6 +11118,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getManufacturedProduct() {

 		if (manufacturedProductEClass == null) {

 			manufacturedProductEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -10132,6 +11132,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getManufacturedProduct_RealmCode() {

 		return (EReference) getManufacturedProduct().getEStructuralFeatures().get(0);

 	}

@@ -10141,6 +11142,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getManufacturedProduct_TypeId() {

 		return (EReference) getManufacturedProduct().getEStructuralFeatures().get(1);

 	}

@@ -10150,6 +11152,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getManufacturedProduct_TemplateId() {

 		return (EReference) getManufacturedProduct().getEStructuralFeatures().get(2);

 	}

@@ -10159,6 +11162,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getManufacturedProduct_Id() {

 		return (EReference) getManufacturedProduct().getEStructuralFeatures().get(3);

 	}

@@ -10168,6 +11172,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getManufacturedProduct_ManufacturedLabeledDrug() {

 		return (EReference) getManufacturedProduct().getEStructuralFeatures().get(4);

 	}

@@ -10177,6 +11182,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getManufacturedProduct_ManufacturedMaterial() {

 		return (EReference) getManufacturedProduct().getEStructuralFeatures().get(5);

 	}

@@ -10186,6 +11192,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getManufacturedProduct_ManufacturerOrganization() {

 		return (EReference) getManufacturedProduct().getEStructuralFeatures().get(6);

 	}

@@ -10195,6 +11202,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getManufacturedProduct_NullFlavor() {

 		return (EAttribute) getManufacturedProduct().getEStructuralFeatures().get(7);

 	}

@@ -10204,6 +11212,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getManufacturedProduct_ClassCode() {

 		return (EAttribute) getManufacturedProduct().getEStructuralFeatures().get(8);

 	}

@@ -10213,6 +11222,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getLabeledDrug() {

 		if (labeledDrugEClass == null) {

 			labeledDrugEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -10226,6 +11236,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLabeledDrug_RealmCode() {

 		return (EReference) getLabeledDrug().getEStructuralFeatures().get(0);

 	}

@@ -10235,6 +11246,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLabeledDrug_TypeId() {

 		return (EReference) getLabeledDrug().getEStructuralFeatures().get(1);

 	}

@@ -10244,6 +11256,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLabeledDrug_TemplateId() {

 		return (EReference) getLabeledDrug().getEStructuralFeatures().get(2);

 	}

@@ -10253,6 +11266,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLabeledDrug_Code() {

 		return (EReference) getLabeledDrug().getEStructuralFeatures().get(3);

 	}

@@ -10262,6 +11276,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getLabeledDrug_Name() {

 		return (EReference) getLabeledDrug().getEStructuralFeatures().get(4);

 	}

@@ -10271,6 +11286,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLabeledDrug_NullFlavor() {

 		return (EAttribute) getLabeledDrug().getEStructuralFeatures().get(5);

 	}

@@ -10280,6 +11296,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLabeledDrug_ClassCode() {

 		return (EAttribute) getLabeledDrug().getEStructuralFeatures().get(6);

 	}

@@ -10289,6 +11306,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getLabeledDrug_DeterminerCode() {

 		return (EAttribute) getLabeledDrug().getEStructuralFeatures().get(7);

 	}

@@ -10298,6 +11316,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getMaterial() {

 		if (materialEClass == null) {

 			materialEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -10311,6 +11330,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaterial_RealmCode() {

 		return (EReference) getMaterial().getEStructuralFeatures().get(0);

 	}

@@ -10320,6 +11340,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaterial_TypeId() {

 		return (EReference) getMaterial().getEStructuralFeatures().get(1);

 	}

@@ -10329,6 +11350,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaterial_TemplateId() {

 		return (EReference) getMaterial().getEStructuralFeatures().get(2);

 	}

@@ -10338,6 +11360,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaterial_Code() {

 		return (EReference) getMaterial().getEStructuralFeatures().get(3);

 	}

@@ -10347,6 +11370,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaterial_Name() {

 		return (EReference) getMaterial().getEStructuralFeatures().get(4);

 	}

@@ -10356,6 +11380,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getMaterial_LotNumberText() {

 		return (EReference) getMaterial().getEStructuralFeatures().get(5);

 	}

@@ -10365,6 +11390,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getMaterial_NullFlavor() {

 		return (EAttribute) getMaterial().getEStructuralFeatures().get(6);

 	}

@@ -10374,6 +11400,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getMaterial_ClassCode() {

 		return (EAttribute) getMaterial().getEStructuralFeatures().get(7);

 	}

@@ -10383,6 +11410,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getMaterial_DeterminerCode() {

 		return (EAttribute) getMaterial().getEStructuralFeatures().get(8);

 	}

@@ -10392,6 +11420,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getSupply() {

 		if (supplyEClass == null) {

 			supplyEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -10405,6 +11434,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_RealmCode() {

 		return (EReference) getSupply().getEStructuralFeatures().get(0);

 	}

@@ -10414,6 +11444,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_TypeId() {

 		return (EReference) getSupply().getEStructuralFeatures().get(1);

 	}

@@ -10423,6 +11454,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_TemplateId() {

 		return (EReference) getSupply().getEStructuralFeatures().get(2);

 	}

@@ -10432,6 +11464,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Id() {

 		return (EReference) getSupply().getEStructuralFeatures().get(3);

 	}

@@ -10441,6 +11474,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Code() {

 		return (EReference) getSupply().getEStructuralFeatures().get(4);

 	}

@@ -10450,6 +11484,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Text() {

 		return (EReference) getSupply().getEStructuralFeatures().get(5);

 	}

@@ -10459,6 +11494,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_StatusCode() {

 		return (EReference) getSupply().getEStructuralFeatures().get(6);

 	}

@@ -10468,6 +11504,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_EffectiveTime() {

 		return (EReference) getSupply().getEStructuralFeatures().get(7);

 	}

@@ -10477,6 +11514,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_PriorityCode() {

 		return (EReference) getSupply().getEStructuralFeatures().get(8);

 	}

@@ -10486,6 +11524,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_RepeatNumber() {

 		return (EReference) getSupply().getEStructuralFeatures().get(9);

 	}

@@ -10495,6 +11534,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_IndependentInd() {

 		return (EReference) getSupply().getEStructuralFeatures().get(10);

 	}

@@ -10504,6 +11544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Quantity() {

 		return (EReference) getSupply().getEStructuralFeatures().get(11);

 	}

@@ -10513,6 +11554,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_ExpectedUseTime() {

 		return (EReference) getSupply().getEStructuralFeatures().get(12);

 	}

@@ -10522,6 +11564,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Subject() {

 		return (EReference) getSupply().getEStructuralFeatures().get(13);

 	}

@@ -10531,6 +11574,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Specimen() {

 		return (EReference) getSupply().getEStructuralFeatures().get(14);

 	}

@@ -10540,6 +11584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Product() {

 		return (EReference) getSupply().getEStructuralFeatures().get(15);

 	}

@@ -10549,6 +11594,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Performer() {

 		return (EReference) getSupply().getEStructuralFeatures().get(16);

 	}

@@ -10558,6 +11604,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Author() {

 		return (EReference) getSupply().getEStructuralFeatures().get(17);

 	}

@@ -10567,6 +11614,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Informant() {

 		return (EReference) getSupply().getEStructuralFeatures().get(18);

 	}

@@ -10576,6 +11624,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Participant() {

 		return (EReference) getSupply().getEStructuralFeatures().get(19);

 	}

@@ -10585,6 +11634,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_EntryRelationship() {

 		return (EReference) getSupply().getEStructuralFeatures().get(20);

 	}

@@ -10594,6 +11644,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Reference() {

 		return (EReference) getSupply().getEStructuralFeatures().get(21);

 	}

@@ -10603,6 +11654,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_Precondition() {

 		return (EReference) getSupply().getEStructuralFeatures().get(22);

 	}

@@ -10612,6 +11664,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getSupply_InFulfillmentOf1() {

 		return (EReference) getSupply().getEStructuralFeatures().get(23);

 	}

@@ -10621,6 +11674,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSupply_NullFlavor() {

 		return (EAttribute) getSupply().getEStructuralFeatures().get(24);

 	}

@@ -10630,6 +11684,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSupply_ClassCode() {

 		return (EAttribute) getSupply().getEStructuralFeatures().get(25);

 	}

@@ -10639,6 +11694,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getSupply_MoodCode() {

 		return (EAttribute) getSupply().getEStructuralFeatures().get(26);

 	}

@@ -10648,6 +11704,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getProduct() {

 		if (productEClass == null) {

 			productEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(CDAPackage.eNS_URI).getEClassifiers().get(

@@ -10661,6 +11718,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProduct_RealmCode() {

 		return (EReference) getProduct().getEStructuralFeatures().get(0);

 	}

@@ -10670,6 +11728,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProduct_TypeId() {

 		return (EReference) getProduct().getEStructuralFeatures().get(1);

 	}

@@ -10679,6 +11738,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProduct_TemplateId() {

 		return (EReference) getProduct().getEStructuralFeatures().get(2);

 	}

@@ -10688,6 +11748,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getProduct_ManufacturedProduct() {

 		return (EReference) getProduct().getEStructuralFeatures().get(3);

 	}

@@ -10697,6 +11758,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getProduct_NullFlavor() {

 		return (EAttribute) getProduct().getEStructuralFeatures().get(4);

 	}

@@ -10706,6 +11768,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getProduct_TypeCode() {

 		return (EAttribute) getProduct().getEStructuralFeatures().get(5);

 	}

@@ -10715,6 +11778,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getComponent5() {

 		if (component5EClass == null) {

 			component5EClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -10728,6 +11792,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent5_RealmCode() {

 		return (EReference) getComponent5().getEStructuralFeatures().get(0);

 	}

@@ -10737,6 +11802,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent5_TypeId() {

 		return (EReference) getComponent5().getEStructuralFeatures().get(1);

 	}

@@ -10746,6 +11812,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent5_TemplateId() {

 		return (EReference) getComponent5().getEStructuralFeatures().get(2);

 	}

@@ -10755,6 +11822,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getComponent5_Section() {

 		return (EReference) getComponent5().getEStructuralFeatures().get(3);

 	}

@@ -10764,6 +11832,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent5_NullFlavor() {

 		return (EAttribute) getComponent5().getEStructuralFeatures().get(4);

 	}

@@ -10773,6 +11842,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent5_TypeCode() {

 		return (EAttribute) getComponent5().getEStructuralFeatures().get(5);

 	}

@@ -10782,6 +11852,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getComponent5_ContextConductionInd() {

 		return (EAttribute) getComponent5().getEStructuralFeatures().get(6);

 	}

@@ -10791,6 +11862,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getDocumentRoot() {

 		if (documentRootEClass == null) {

 			documentRootEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -10804,6 +11876,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EAttribute getDocumentRoot_Mixed() {

 		return (EAttribute) getDocumentRoot().getEStructuralFeatures().get(0);

 	}

@@ -10813,6 +11886,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDocumentRoot_XMLNSPrefixMap() {

 		return (EReference) getDocumentRoot().getEStructuralFeatures().get(1);

 	}

@@ -10822,6 +11896,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDocumentRoot_XSISchemaLocation() {

 		return (EReference) getDocumentRoot().getEStructuralFeatures().get(2);

 	}

@@ -10831,6 +11906,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EReference getDocumentRoot_ClinicalDocument() {

 		return (EReference) getDocumentRoot().getEStructuralFeatures().get(3);

 	}

@@ -10840,6 +11916,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EClass getRegistryDelegate() {

 		if (registryDelegateEClass == null) {

 			registryDelegateEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(

@@ -10853,6 +11930,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CDAFactory getCDAFactory() {

 		return (CDAFactory) getEFactoryInstance();

 	}

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ClinicalDocumentImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ClinicalDocumentImpl.java
index 3e19eb7..4be132e 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ClinicalDocumentImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ClinicalDocumentImpl.java
@@ -523,6 +523,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -563,6 +564,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public II getId() {

 		return id;

 	}

@@ -592,6 +594,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setId(II newId) {

 		if (newId != id) {

 			NotificationChain msgs = null;

@@ -617,6 +620,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -646,6 +650,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -672,6 +677,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ST getTitle() {

 		return title;

 	}

@@ -701,6 +707,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTitle(ST newTitle) {

 		if (newTitle != title) {

 			NotificationChain msgs = null;

@@ -727,6 +734,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -757,6 +765,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -785,6 +794,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getConfidentialityCode() {

 		return confidentialityCode;

 	}

@@ -815,6 +825,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setConfidentialityCode(CE newConfidentialityCode) {

 		if (newConfidentialityCode != confidentialityCode) {

 			NotificationChain msgs = null;

@@ -843,6 +854,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -872,6 +884,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -900,6 +913,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public II getSetId() {

 		return setId;

 	}

@@ -929,6 +943,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSetId(II newSetId) {

 		if (newSetId != setId) {

 			NotificationChain msgs = null;

@@ -956,6 +971,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public INT getVersionNumber() {

 		return versionNumber;

 	}

@@ -986,6 +1002,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setVersionNumber(INT newVersionNumber) {

 		if (newVersionNumber != versionNumber) {

 			NotificationChain msgs = null;

@@ -1014,6 +1031,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getCopyTime() {

 		return copyTime;

 	}

@@ -1043,6 +1061,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCopyTime(TS newCopyTime) {

 		if (newCopyTime != copyTime) {

 			NotificationChain msgs = null;

@@ -1070,6 +1089,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<RecordTarget> getRecordTargets() {

 		if (recordTargets == null) {

 			recordTargets = new EObjectContainmentEList<RecordTarget>(

@@ -1083,6 +1103,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.CLINICAL_DOCUMENT__AUTHOR);

@@ -1095,6 +1116,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public DataEnterer getDataEnterer() {

 		return dataEnterer;

 	}

@@ -1124,6 +1146,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDataEnterer(DataEnterer newDataEnterer) {

 		if (newDataEnterer != dataEnterer) {

 			NotificationChain msgs = null;

@@ -1152,6 +1175,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -1165,6 +1189,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Custodian getCustodian() {

 		return custodian;

 	}

@@ -1194,6 +1219,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCustodian(Custodian newCustodian) {

 		if (newCustodian != custodian) {

 			NotificationChain msgs = null;

@@ -1221,6 +1247,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<InformationRecipient> getInformationRecipients() {

 		if (informationRecipients == null) {

 			informationRecipients = new EObjectContainmentEList<InformationRecipient>(

@@ -1234,6 +1261,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public LegalAuthenticator getLegalAuthenticator() {

 		return legalAuthenticator;

 	}

@@ -1265,6 +1293,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLegalAuthenticator(LegalAuthenticator newLegalAuthenticator) {

 		if (newLegalAuthenticator != legalAuthenticator) {

 			NotificationChain msgs = null;

@@ -1293,6 +1322,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Authenticator> getAuthenticators() {

 		if (authenticators == null) {

 			authenticators = new EObjectContainmentEList<Authenticator>(

@@ -1306,6 +1336,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant1> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant1>(

@@ -1319,6 +1350,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<InFulfillmentOf> getInFulfillmentOfs() {

 		if (inFulfillmentOfs == null) {

 			inFulfillmentOfs = new EObjectContainmentEList<InFulfillmentOf>(

@@ -1332,6 +1364,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<DocumentationOf> getDocumentationOfs() {

 		if (documentationOfs == null) {

 			documentationOfs = new EObjectContainmentEList<DocumentationOf>(

@@ -1345,6 +1378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<RelatedDocument> getRelatedDocuments() {

 		if (relatedDocuments == null) {

 			relatedDocuments = new EObjectContainmentEList<RelatedDocument>(

@@ -1358,6 +1392,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Authorization> getAuthorizations() {

 		if (authorizations == null) {

 			authorizations = new EObjectContainmentEList<Authorization>(

@@ -1371,6 +1406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Component1 getComponentOf() {

 		return componentOf;

 	}

@@ -1400,6 +1436,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setComponentOf(Component1 newComponentOf) {

 		if (newComponentOf != componentOf) {

 			NotificationChain msgs = null;

@@ -1428,6 +1465,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Component2 getComponent() {

 		return component;

 	}

@@ -1457,6 +1495,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setComponent(Component2 newComponent) {

 		if (newComponent != component) {

 			NotificationChain msgs = null;

@@ -1494,6 +1533,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -1514,6 +1554,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -1532,6 +1573,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1551,6 +1593,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClinicalDocument newClassCode) {

 		ActClinicalDocument oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1571,6 +1614,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClinicalDocument oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1589,6 +1633,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1608,6 +1653,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -1628,6 +1674,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -1646,6 +1693,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -2205,7 +2253,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component1Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component1Impl.java
index 126830c..089e0c1 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component1Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component1Impl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -256,6 +257,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EncompassingEncounter getEncompassingEncounter() {

 		return encompassingEncounter;

 	}

@@ -287,6 +289,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEncompassingEncounter(EncompassingEncounter newEncompassingEncounter) {

 		if (newEncompassingEncounter != encompassingEncounter) {

 			NotificationChain msgs = null;

@@ -325,6 +328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -345,6 +349,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -363,6 +368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -382,6 +388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipHasComponent newTypeCode) {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -401,6 +408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -419,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -574,7 +583,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component2Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component2Impl.java
index 59f19f1..74f8a25 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component2Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component2Impl.java
@@ -259,6 +259,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -298,6 +299,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public NonXMLBody getNonXMLBody() {

 		return nonXMLBody;

 	}

@@ -327,6 +329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNonXMLBody(NonXMLBody newNonXMLBody) {

 		if (newNonXMLBody != nonXMLBody) {

 			NotificationChain msgs = null;

@@ -354,6 +357,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public StructuredBody getStructuredBody() {

 		return structuredBody;

 	}

@@ -383,6 +387,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStructuredBody(StructuredBody newStructuredBody) {

 		if (newStructuredBody != structuredBody) {

 			NotificationChain msgs = null;

@@ -421,6 +426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -441,6 +447,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -459,6 +466,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -478,6 +486,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipHasComponent newTypeCode) {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -497,6 +506,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -515,6 +525,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -524,6 +535,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Boolean getContextConductionInd() {

 		return contextConductionInd;

 	}

@@ -533,6 +545,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextConductionInd(Boolean newContextConductionInd) {

 		Boolean oldContextConductionInd = contextConductionInd;

 		contextConductionInd = newContextConductionInd;

@@ -551,6 +564,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextConductionInd() {

 		Boolean oldContextConductionInd = contextConductionInd;

 		boolean oldContextConductionIndESet = contextConductionIndESet;

@@ -569,6 +583,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextConductionInd() {

 		return contextConductionIndESet;

 	}

@@ -764,7 +779,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component3Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component3Impl.java
index 346210f..2d70c7f 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component3Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component3Impl.java
@@ -247,6 +247,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -286,6 +287,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Section getSection() {

 		return section;

 	}

@@ -315,6 +317,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSection(Section newSection) {

 		if (newSection != section) {

 			NotificationChain msgs = null;

@@ -351,6 +354,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -371,6 +375,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -389,6 +394,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -408,6 +414,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipHasComponent newTypeCode) {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -427,6 +434,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -445,6 +453,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -454,6 +463,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Boolean getContextConductionInd() {

 		return contextConductionInd;

 	}

@@ -463,6 +473,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextConductionInd(Boolean newContextConductionInd) {

 		Boolean oldContextConductionInd = contextConductionInd;

 		contextConductionInd = newContextConductionInd;

@@ -481,6 +492,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextConductionInd() {

 		Boolean oldContextConductionInd = contextConductionInd;

 		boolean oldContextConductionIndESet = contextConductionIndESet;

@@ -499,6 +511,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextConductionInd() {

 		return contextConductionIndESet;

 	}

@@ -673,7 +686,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component4Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component4Impl.java
index 08d0e03..81f17fb 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component4Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component4Impl.java
@@ -378,6 +378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -417,6 +418,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public INT getSequenceNumber() {

 		return sequenceNumber;

 	}

@@ -446,6 +448,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSequenceNumber(INT newSequenceNumber) {

 		if (newSequenceNumber != sequenceNumber) {

 			NotificationChain msgs = null;

@@ -474,6 +477,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public INT getPriorityNumber() {

 		return priorityNumber;

 	}

@@ -503,6 +507,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPriorityNumber(INT newPriorityNumber) {

 		if (newPriorityNumber != priorityNumber) {

 			NotificationChain msgs = null;

@@ -531,6 +536,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public BL getSeperatableInd() {

 		return seperatableInd;

 	}

@@ -560,6 +566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSeperatableInd(BL newSeperatableInd) {

 		if (newSeperatableInd != seperatableInd) {

 			NotificationChain msgs = null;

@@ -588,6 +595,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Act getAct() {

 		return act;

 	}

@@ -617,6 +625,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAct(Act newAct) {

 		if (newAct != act) {

 			NotificationChain msgs = null;

@@ -642,6 +651,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Encounter getEncounter() {

 		return encounter;

 	}

@@ -671,6 +681,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEncounter(Encounter newEncounter) {

 		if (newEncounter != encounter) {

 			NotificationChain msgs = null;

@@ -698,6 +709,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Observation getObservation() {

 		return observation;

 	}

@@ -727,6 +739,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setObservation(Observation newObservation) {

 		if (newObservation != observation) {

 			NotificationChain msgs = null;

@@ -754,6 +767,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ObservationMedia getObservationMedia() {

 		return observationMedia;

 	}

@@ -784,6 +798,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setObservationMedia(ObservationMedia newObservationMedia) {

 		if (newObservationMedia != observationMedia) {

 			NotificationChain msgs = null;

@@ -812,6 +827,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organizer getOrganizer() {

 		return organizer;

 	}

@@ -841,6 +857,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setOrganizer(Organizer newOrganizer) {

 		if (newOrganizer != organizer) {

 			NotificationChain msgs = null;

@@ -868,6 +885,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Procedure getProcedure() {

 		return procedure;

 	}

@@ -897,6 +915,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setProcedure(Procedure newProcedure) {

 		if (newProcedure != procedure) {

 			NotificationChain msgs = null;

@@ -924,6 +943,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RegionOfInterest getRegionOfInterest() {

 		return regionOfInterest;

 	}

@@ -954,6 +974,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRegionOfInterest(RegionOfInterest newRegionOfInterest) {

 		if (newRegionOfInterest != regionOfInterest) {

 			NotificationChain msgs = null;

@@ -982,6 +1003,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SubstanceAdministration getSubstanceAdministration() {

 		return substanceAdministration;

 	}

@@ -1013,6 +1035,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubstanceAdministration(SubstanceAdministration newSubstanceAdministration) {

 		if (newSubstanceAdministration != substanceAdministration) {

 			NotificationChain msgs = null;

@@ -1041,6 +1064,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Supply getSupply() {

 		return supply;

 	}

@@ -1070,6 +1094,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSupply(Supply newSupply) {

 		if (newSupply != supply) {

 			NotificationChain msgs = null;

@@ -1105,6 +1130,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -1125,6 +1151,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -1143,6 +1170,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1162,6 +1190,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipHasComponent newTypeCode) {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -1181,6 +1210,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -1199,6 +1229,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -1208,6 +1239,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Boolean getContextConductionInd() {

 		return contextConductionInd;

 	}

@@ -1217,6 +1249,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextConductionInd(Boolean newContextConductionInd) {

 		Boolean oldContextConductionInd = contextConductionInd;

 		contextConductionInd = newContextConductionInd;

@@ -1235,6 +1268,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextConductionInd() {

 		Boolean oldContextConductionInd = contextConductionInd;

 		boolean oldContextConductionIndESet = contextConductionIndESet;

@@ -1253,6 +1287,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextConductionInd() {

 		return contextConductionIndESet;

 	}

@@ -1568,7 +1603,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component5Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component5Impl.java
index 1f0f835..188a3dc 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component5Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Component5Impl.java
@@ -247,6 +247,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -286,6 +287,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Section getSection() {

 		return section;

 	}

@@ -315,6 +317,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSection(Section newSection) {

 		if (newSection != section) {

 			NotificationChain msgs = null;

@@ -351,6 +354,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -371,6 +375,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -389,6 +394,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -408,6 +414,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipHasComponent newTypeCode) {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -427,6 +434,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipHasComponent oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -445,6 +453,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -454,6 +463,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Boolean getContextConductionInd() {

 		return contextConductionInd;

 	}

@@ -463,6 +473,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextConductionInd(Boolean newContextConductionInd) {

 		Boolean oldContextConductionInd = contextConductionInd;

 		contextConductionInd = newContextConductionInd;

@@ -481,6 +492,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextConductionInd() {

 		Boolean oldContextConductionInd = contextConductionInd;

 		boolean oldContextConductionIndESet = contextConductionIndESet;

@@ -499,6 +511,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextConductionInd() {

 		return contextConductionIndESet;

 	}

@@ -673,7 +686,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ConsentImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ConsentImpl.java
index 8997228..4aa1de5 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ConsentImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ConsentImpl.java
@@ -270,6 +270,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -308,6 +309,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.CONSENT__ID);

@@ -320,6 +322,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -349,6 +352,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -374,6 +378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -403,6 +408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -440,6 +446,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -460,6 +467,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -478,6 +486,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -497,6 +506,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -517,6 +527,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -535,6 +546,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -554,6 +566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -573,6 +586,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -591,6 +605,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -790,7 +805,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ConsumableImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ConsumableImpl.java
index 8621f2a..18b2613 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ConsumableImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ConsumableImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -256,6 +257,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ManufacturedProduct getManufacturedProduct() {

 		return manufacturedProduct;

 	}

@@ -287,6 +289,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setManufacturedProduct(ManufacturedProduct newManufacturedProduct) {

 		if (newManufacturedProduct != manufacturedProduct) {

 			NotificationChain msgs = null;

@@ -325,6 +328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -345,6 +349,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -363,6 +368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -382,6 +388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -401,6 +408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -419,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -574,7 +583,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CriterionImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CriterionImpl.java
index 5c21ca4..a9cef83 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CriterionImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CriterionImpl.java
@@ -272,6 +272,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -310,6 +311,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -339,6 +341,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -364,6 +367,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -393,6 +397,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -418,6 +423,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ANY getValue() {

 		return value;

 	}

@@ -447,6 +453,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setValue(ANY newValue) {

 		if (newValue != value) {

 			NotificationChain msgs = null;

@@ -482,6 +489,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -502,6 +510,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -520,6 +529,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -539,6 +549,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassObservation newClassCode) {

 		ActClassObservation oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -559,6 +570,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassObservation oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -577,6 +589,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -596,6 +609,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -615,6 +629,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -633,6 +648,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -822,7 +838,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CustodianImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CustodianImpl.java
index 6195444..fde6125 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CustodianImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CustodianImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -255,6 +256,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedCustodian getAssignedCustodian() {

 		return assignedCustodian;

 	}

@@ -285,6 +287,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedCustodian(AssignedCustodian newAssignedCustodian) {

 		if (newAssignedCustodian != assignedCustodian) {

 			NotificationChain msgs = null;

@@ -323,6 +326,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -343,6 +347,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -361,6 +366,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -380,6 +386,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -399,6 +406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -417,6 +425,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -572,7 +581,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CustodianOrganizationImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CustodianOrganizationImpl.java
index 1d407b9..9bb474a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CustodianOrganizationImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/CustodianOrganizationImpl.java
@@ -284,6 +284,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -325,6 +326,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.CUSTODIAN_ORGANIZATION__ID);

@@ -337,6 +339,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ON getName() {

 		return name;

 	}

@@ -366,6 +369,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setName(ON newName) {

 		if (newName != name) {

 			NotificationChain msgs = null;

@@ -393,6 +397,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TEL getTelecom() {

 		return telecom;

 	}

@@ -422,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTelecom(TEL newTelecom) {

 		if (newTelecom != telecom) {

 			NotificationChain msgs = null;

@@ -449,6 +455,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AD getAddr() {

 		return addr;

 	}

@@ -478,6 +485,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAddr(AD newAddr) {

 		if (newAddr != addr) {

 			NotificationChain msgs = null;

@@ -515,6 +523,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -535,6 +544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -553,6 +563,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -572,6 +583,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassOrganization newClassCode) {

 		EntityClassOrganization oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -592,6 +604,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassOrganization oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -610,6 +623,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -629,6 +643,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -649,6 +664,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -667,6 +683,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -905,7 +922,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DataEntererImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DataEntererImpl.java
index 90d901e..3a161ba 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DataEntererImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DataEntererImpl.java
@@ -261,6 +261,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -300,6 +301,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getTime() {

 		return time;

 	}

@@ -329,6 +331,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -354,6 +357,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity getAssignedEntity() {

 		return assignedEntity;

 	}

@@ -383,6 +387,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedEntity(AssignedEntity newAssignedEntity) {

 		if (newAssignedEntity != assignedEntity) {

 			NotificationChain msgs = null;

@@ -421,6 +426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -441,6 +447,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -459,6 +466,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -478,6 +486,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -498,6 +507,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -516,6 +526,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -525,6 +536,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ContextControl getContextControlCode() {

 		return contextControlCode;

 	}

@@ -534,6 +546,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextControlCode(ContextControl newContextControlCode) {

 		ContextControl oldContextControlCode = contextControlCode;

 		contextControlCode = newContextControlCode == null

@@ -554,6 +567,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextControlCode() {

 		ContextControl oldContextControlCode = contextControlCode;

 		boolean oldContextControlCodeESet = contextControlCodeESet;

@@ -572,6 +586,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextControlCode() {

 		return contextControlCodeESet;

 	}

@@ -767,7 +782,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DeviceImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DeviceImpl.java
index 1a2da58..4cbc102 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DeviceImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DeviceImpl.java
@@ -271,6 +271,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -309,6 +310,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -338,6 +340,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -363,6 +366,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SC getManufacturerModelName() {

 		return manufacturerModelName;

 	}

@@ -393,6 +397,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setManufacturerModelName(SC newManufacturerModelName) {

 		if (newManufacturerModelName != manufacturerModelName) {

 			NotificationChain msgs = null;

@@ -421,6 +426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SC getSoftwareName() {

 		return softwareName;

 	}

@@ -450,6 +456,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSoftwareName(SC newSoftwareName) {

 		if (newSoftwareName != softwareName) {

 			NotificationChain msgs = null;

@@ -487,6 +494,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -507,6 +515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -525,6 +534,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -544,6 +554,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassDevice newClassCode) {

 		EntityClassDevice oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -563,6 +574,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassDevice oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -581,6 +593,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -600,6 +613,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -620,6 +634,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -638,6 +653,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -827,7 +843,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DocumentRootImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DocumentRootImpl.java
index 7878fc3..ab3a445 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DocumentRootImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DocumentRootImpl.java
@@ -97,6 +97,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public FeatureMap getMixed() {

 		if (mixed == null) {

 			mixed = new BasicFeatureMap(this, CDAPackage.DOCUMENT_ROOT__MIXED);

@@ -109,6 +110,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EMap<String, String> getXMLNSPrefixMap() {

 		if (xMLNSPrefixMap == null) {

 			xMLNSPrefixMap = new EcoreEMap<String, String>(

@@ -123,6 +125,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EMap<String, String> getXSISchemaLocation() {

 		if (xSISchemaLocation == null) {

 			xSISchemaLocation = new EcoreEMap<String, String>(

@@ -137,6 +140,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ClinicalDocument getClinicalDocument() {

 		return (ClinicalDocument) getMixed().get(CDAPackage.Literals.DOCUMENT_ROOT__CLINICAL_DOCUMENT, true);

 	}

@@ -156,6 +160,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClinicalDocument(ClinicalDocument newClinicalDocument) {

 		((FeatureMap.Internal) getMixed()).set(

 			CDAPackage.Literals.DOCUMENT_ROOT__CLINICAL_DOCUMENT, newClinicalDocument);

@@ -289,7 +294,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (mixed: ");

 		result.append(mixed);

 		result.append(')');

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DocumentationOfImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DocumentationOfImpl.java
index 7a5d9fa..f90674b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DocumentationOfImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/DocumentationOfImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -257,6 +258,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ServiceEvent getServiceEvent() {

 		return serviceEvent;

 	}

@@ -286,6 +288,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setServiceEvent(ServiceEvent newServiceEvent) {

 		if (newServiceEvent != serviceEvent) {

 			NotificationChain msgs = null;

@@ -324,6 +327,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -344,6 +348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -362,6 +367,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -381,6 +387,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipType newTypeCode) {

 		ActRelationshipType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -401,6 +408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -419,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -574,7 +583,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncompassingEncounterImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncompassingEncounterImpl.java
index e66e60e..bbc01fe 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncompassingEncounterImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncompassingEncounterImpl.java
@@ -318,6 +318,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -359,6 +360,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ENCOMPASSING_ENCOUNTER__ID);

@@ -371,6 +373,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -400,6 +403,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -427,6 +431,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -457,6 +462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -485,6 +491,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getDischargeDispositionCode() {

 		return dischargeDispositionCode;

 	}

@@ -515,6 +522,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDischargeDispositionCode(CE newDischargeDispositionCode) {

 		if (newDischargeDispositionCode != dischargeDispositionCode) {

 			NotificationChain msgs = null;

@@ -545,6 +553,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ResponsibleParty getResponsibleParty() {

 		return responsibleParty;

 	}

@@ -575,6 +584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setResponsibleParty(ResponsibleParty newResponsibleParty) {

 		if (newResponsibleParty != responsibleParty) {

 			NotificationChain msgs = null;

@@ -603,6 +613,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EncounterParticipant> getEncounterParticipants() {

 		if (encounterParticipants == null) {

 			encounterParticipants = new EObjectContainmentEList<EncounterParticipant>(

@@ -616,6 +627,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Location getLocation() {

 		return location;

 	}

@@ -645,6 +657,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLocation(Location newLocation) {

 		if (newLocation != location) {

 			NotificationChain msgs = null;

@@ -682,6 +695,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -702,6 +716,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -720,6 +735,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -739,6 +755,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -759,6 +776,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -777,6 +795,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -796,6 +815,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -816,6 +836,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -834,6 +855,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1082,7 +1104,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncounterImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncounterImpl.java
index 37edfe4..c976f6c 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncounterImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncounterImpl.java
@@ -423,6 +423,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -461,6 +462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ENCOUNTER__ID);

@@ -473,6 +475,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -502,6 +505,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -527,6 +531,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -556,6 +561,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -581,6 +587,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -610,6 +617,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -637,6 +645,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -666,6 +675,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -693,6 +703,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getSDTCDischargeDispositionCodes() {

 		if (sDTCDischargeDispositionCodes == null) {

 			sDTCDischargeDispositionCodes = new EObjectContainmentEList<CE>(

@@ -706,6 +717,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getPriorityCode() {

 		return priorityCode;

 	}

@@ -735,6 +747,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPriorityCode(CE newPriorityCode) {

 		if (newPriorityCode != priorityCode) {

 			NotificationChain msgs = null;

@@ -762,6 +775,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -791,6 +805,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -817,6 +832,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(Specimen.class, this, CDAPackage.ENCOUNTER__SPECIMEN);

@@ -829,6 +845,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(

@@ -842,6 +859,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.ENCOUNTER__AUTHOR);

@@ -854,6 +872,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -867,6 +886,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -880,6 +900,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EntryRelationship> getEntryRelationships() {

 		if (entryRelationships == null) {

 			entryRelationships = new EObjectContainmentEList<EntryRelationship>(

@@ -893,6 +914,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(Reference.class, this, CDAPackage.ENCOUNTER__REFERENCE);

@@ -905,6 +927,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -918,6 +941,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<InFulfillmentOf1> getInFulfillmentOf1s() {

 		if (inFulfillmentOf1s == null) {

 			inFulfillmentOf1s = new EObjectContainmentEList<InFulfillmentOf1>(

@@ -941,6 +965,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -961,6 +986,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -979,6 +1005,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -998,6 +1025,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1018,6 +1046,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1036,6 +1065,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1055,6 +1085,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(x_DocumentEncounterMood newMoodCode) {

 		x_DocumentEncounterMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -1074,6 +1105,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		x_DocumentEncounterMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -1092,6 +1124,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1451,7 +1484,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncounterParticipantImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncounterParticipantImpl.java
index 8b4cc5c..8da46d8 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncounterParticipantImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EncounterParticipantImpl.java
@@ -226,6 +226,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -267,6 +268,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getTime() {

 		return time;

 	}

@@ -296,6 +298,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(IVL_TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -323,6 +326,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity getAssignedEntity() {

 		return assignedEntity;

 	}

@@ -353,6 +357,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedEntity(AssignedEntity newAssignedEntity) {

 		if (newAssignedEntity != assignedEntity) {

 			NotificationChain msgs = null;

@@ -391,6 +396,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -411,6 +417,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -429,6 +436,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -448,6 +456,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(x_EncounterParticipant newTypeCode) {

 		x_EncounterParticipant oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -468,6 +477,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		x_EncounterParticipant oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -486,6 +496,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -644,7 +655,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntityImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntityImpl.java
index b01aabe..d6c748b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntityImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntityImpl.java
@@ -270,6 +270,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -308,6 +309,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ENTITY__ID);

@@ -320,6 +322,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -349,6 +352,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -374,6 +378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getDesc() {

 		return desc;

 	}

@@ -403,6 +408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDesc(ED newDesc) {

 		if (newDesc != desc) {

 			NotificationChain msgs = null;

@@ -438,6 +444,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -458,6 +465,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -476,6 +484,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -495,6 +504,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassRoot newClassCode) {

 		EntityClassRoot oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -514,6 +524,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassRoot oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -532,6 +543,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -551,6 +563,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -571,6 +584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -589,6 +603,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -779,7 +794,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntryImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntryImpl.java
index 0efc230..c617c12 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntryImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntryImpl.java
@@ -343,6 +343,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -381,6 +382,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Act getAct() {

 		return act;

 	}

@@ -410,6 +412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAct(Act newAct) {

 		if (newAct != act) {

 			NotificationChain msgs = null;

@@ -435,6 +438,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Encounter getEncounter() {

 		return encounter;

 	}

@@ -464,6 +468,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEncounter(Encounter newEncounter) {

 		if (newEncounter != encounter) {

 			NotificationChain msgs = null;

@@ -490,6 +495,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Observation getObservation() {

 		return observation;

 	}

@@ -519,6 +525,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setObservation(Observation newObservation) {

 		if (newObservation != observation) {

 			NotificationChain msgs = null;

@@ -546,6 +553,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ObservationMedia getObservationMedia() {

 		return observationMedia;

 	}

@@ -575,6 +583,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setObservationMedia(ObservationMedia newObservationMedia) {

 		if (newObservationMedia != observationMedia) {

 			NotificationChain msgs = null;

@@ -603,6 +612,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organizer getOrganizer() {

 		return organizer;

 	}

@@ -632,6 +642,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setOrganizer(Organizer newOrganizer) {

 		if (newOrganizer != organizer) {

 			NotificationChain msgs = null;

@@ -658,6 +669,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Procedure getProcedure() {

 		return procedure;

 	}

@@ -687,6 +699,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setProcedure(Procedure newProcedure) {

 		if (newProcedure != procedure) {

 			NotificationChain msgs = null;

@@ -713,6 +726,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RegionOfInterest getRegionOfInterest() {

 		return regionOfInterest;

 	}

@@ -742,6 +756,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRegionOfInterest(RegionOfInterest newRegionOfInterest) {

 		if (newRegionOfInterest != regionOfInterest) {

 			NotificationChain msgs = null;

@@ -770,6 +785,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SubstanceAdministration getSubstanceAdministration() {

 		return substanceAdministration;

 	}

@@ -801,6 +817,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubstanceAdministration(SubstanceAdministration newSubstanceAdministration) {

 		if (newSubstanceAdministration != substanceAdministration) {

 			NotificationChain msgs = null;

@@ -829,6 +846,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Supply getSupply() {

 		return supply;

 	}

@@ -858,6 +876,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSupply(Supply newSupply) {

 		if (newSupply != supply) {

 			NotificationChain msgs = null;

@@ -893,6 +912,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -913,6 +933,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -931,6 +952,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -950,6 +972,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(x_ActRelationshipEntry newTypeCode) {

 		x_ActRelationshipEntry oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -969,6 +992,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		x_ActRelationshipEntry oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -987,6 +1011,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -996,6 +1021,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Boolean getContextConductionInd() {

 		return contextConductionInd;

 	}

@@ -1005,6 +1031,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextConductionInd(Boolean newContextConductionInd) {

 		Boolean oldContextConductionInd = contextConductionInd;

 		contextConductionInd = newContextConductionInd;

@@ -1023,6 +1050,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextConductionInd() {

 		Boolean oldContextConductionInd = contextConductionInd;

 		boolean oldContextConductionIndESet = contextConductionIndESet;

@@ -1041,6 +1069,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextConductionInd() {

 		return contextConductionIndESet;

 	}

@@ -1311,7 +1340,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntryRelationshipImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntryRelationshipImpl.java
index 3c3d23f..c20e37a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntryRelationshipImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/EntryRelationshipImpl.java
@@ -427,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -467,6 +468,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public INT getSequenceNumber() {

 		return sequenceNumber;

 	}

@@ -497,6 +499,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSequenceNumber(INT newSequenceNumber) {

 		if (newSequenceNumber != sequenceNumber) {

 			NotificationChain msgs = null;

@@ -525,6 +528,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public BL getSeperatableInd() {

 		return seperatableInd;

 	}

@@ -555,6 +559,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSeperatableInd(BL newSeperatableInd) {

 		if (newSeperatableInd != seperatableInd) {

 			NotificationChain msgs = null;

@@ -583,6 +588,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Act getAct() {

 		return act;

 	}

@@ -612,6 +618,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAct(Act newAct) {

 		if (newAct != act) {

 			NotificationChain msgs = null;

@@ -637,6 +644,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Encounter getEncounter() {

 		return encounter;

 	}

@@ -666,6 +674,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEncounter(Encounter newEncounter) {

 		if (newEncounter != encounter) {

 			NotificationChain msgs = null;

@@ -693,6 +702,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Observation getObservation() {

 		return observation;

 	}

@@ -722,6 +732,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setObservation(Observation newObservation) {

 		if (newObservation != observation) {

 			NotificationChain msgs = null;

@@ -750,6 +761,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ObservationMedia getObservationMedia() {

 		return observationMedia;

 	}

@@ -780,6 +792,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setObservationMedia(ObservationMedia newObservationMedia) {

 		if (newObservationMedia != observationMedia) {

 			NotificationChain msgs = null;

@@ -808,6 +821,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organizer getOrganizer() {

 		return organizer;

 	}

@@ -837,6 +851,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setOrganizer(Organizer newOrganizer) {

 		if (newOrganizer != organizer) {

 			NotificationChain msgs = null;

@@ -864,6 +879,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Procedure getProcedure() {

 		return procedure;

 	}

@@ -893,6 +909,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setProcedure(Procedure newProcedure) {

 		if (newProcedure != procedure) {

 			NotificationChain msgs = null;

@@ -920,6 +937,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RegionOfInterest getRegionOfInterest() {

 		return regionOfInterest;

 	}

@@ -950,6 +968,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRegionOfInterest(RegionOfInterest newRegionOfInterest) {

 		if (newRegionOfInterest != regionOfInterest) {

 			NotificationChain msgs = null;

@@ -978,6 +997,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SubstanceAdministration getSubstanceAdministration() {

 		return substanceAdministration;

 	}

@@ -1009,6 +1029,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubstanceAdministration(SubstanceAdministration newSubstanceAdministration) {

 		if (newSubstanceAdministration != substanceAdministration) {

 			NotificationChain msgs = null;

@@ -1037,6 +1058,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Supply getSupply() {

 		return supply;

 	}

@@ -1066,6 +1088,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSupply(Supply newSupply) {

 		if (newSupply != supply) {

 			NotificationChain msgs = null;

@@ -1103,6 +1126,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -1123,6 +1147,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -1141,6 +1166,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1160,6 +1186,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(x_ActRelationshipEntryRelationship newTypeCode) {

 		x_ActRelationshipEntryRelationship oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -1180,6 +1207,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		x_ActRelationshipEntryRelationship oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -1198,6 +1226,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -1207,6 +1236,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Boolean getInversionInd() {

 		return inversionInd;

 	}

@@ -1216,6 +1246,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setInversionInd(Boolean newInversionInd) {

 		Boolean oldInversionInd = inversionInd;

 		inversionInd = newInversionInd;

@@ -1234,6 +1265,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetInversionInd() {

 		Boolean oldInversionInd = inversionInd;

 		boolean oldInversionIndESet = inversionIndESet;

@@ -1252,6 +1284,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetInversionInd() {

 		return inversionIndESet;

 	}

@@ -1261,6 +1294,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Boolean getContextConductionInd() {

 		return contextConductionInd;

 	}

@@ -1270,6 +1304,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextConductionInd(Boolean newContextConductionInd) {

 		Boolean oldContextConductionInd = contextConductionInd;

 		contextConductionInd = newContextConductionInd;

@@ -1288,6 +1323,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextConductionInd() {

 		Boolean oldContextConductionInd = contextConductionInd;

 		boolean oldContextConductionIndESet = contextConductionIndESet;

@@ -1306,6 +1342,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextConductionInd() {

 		return contextConductionIndESet;

 	}

@@ -1315,6 +1352,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Boolean getNegationInd() {

 		return negationInd;

 	}

@@ -1324,6 +1362,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNegationInd(Boolean newNegationInd) {

 		Boolean oldNegationInd = negationInd;

 		negationInd = newNegationInd;

@@ -1342,6 +1381,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNegationInd() {

 		Boolean oldNegationInd = negationInd;

 		boolean oldNegationIndESet = negationIndESet;

@@ -1360,6 +1400,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNegationInd() {

 		return negationIndESet;

 	}

@@ -1665,7 +1706,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalActImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalActImpl.java
index 9519bf0..aca98b7 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalActImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalActImpl.java
@@ -271,6 +271,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -310,6 +311,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.EXTERNAL_ACT__ID);

@@ -322,6 +324,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -351,6 +354,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -376,6 +380,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -405,6 +410,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -440,6 +446,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -460,6 +467,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -478,6 +486,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -497,6 +506,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassRoot newClassCode) {

 		ActClassRoot oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -517,6 +527,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassRoot oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -535,6 +546,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -554,6 +566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -574,6 +587,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -592,6 +606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -782,7 +797,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalDocumentImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalDocumentImpl.java
index c711e96..7d20aad 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalDocumentImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalDocumentImpl.java
@@ -294,6 +294,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -334,6 +335,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.EXTERNAL_DOCUMENT__ID);

@@ -346,6 +348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -375,6 +378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -401,6 +405,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -430,6 +435,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -456,6 +462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public II getSetId() {

 		return setId;

 	}

@@ -485,6 +492,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSetId(II newSetId) {

 		if (newSetId != setId) {

 			NotificationChain msgs = null;

@@ -512,6 +520,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public INT getVersionNumber() {

 		return versionNumber;

 	}

@@ -542,6 +551,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setVersionNumber(INT newVersionNumber) {

 		if (newVersionNumber != versionNumber) {

 			NotificationChain msgs = null;

@@ -580,6 +590,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -600,6 +611,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -618,6 +630,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -637,6 +650,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassDocument newClassCode) {

 		ActClassDocument oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -657,6 +671,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassDocument oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -675,6 +690,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -694,6 +710,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -714,6 +731,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -732,6 +750,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -946,7 +965,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalObservationImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalObservationImpl.java
index 1495de8..fd91461 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalObservationImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalObservationImpl.java
@@ -271,6 +271,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -311,6 +312,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.EXTERNAL_OBSERVATION__ID);

@@ -323,6 +325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -352,6 +355,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -378,6 +382,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -407,6 +412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -443,6 +449,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -463,6 +470,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -481,6 +489,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -500,6 +509,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassObservation newClassCode) {

 		ActClassObservation oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -520,6 +530,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassObservation oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -538,6 +549,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -557,6 +569,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -577,6 +590,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -595,6 +609,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -785,7 +800,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalProcedureImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalProcedureImpl.java
index eda4628..a924471 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalProcedureImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ExternalProcedureImpl.java
@@ -271,6 +271,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -311,6 +312,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.EXTERNAL_PROCEDURE__ID);

@@ -323,6 +325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -352,6 +355,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -378,6 +382,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -407,6 +412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -443,6 +449,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -463,6 +470,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -481,6 +489,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -500,6 +509,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -520,6 +530,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -538,6 +549,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -557,6 +569,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -577,6 +590,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -595,6 +609,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -794,7 +809,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/GuardianImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/GuardianImpl.java
index 8288be9..18d90c8 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/GuardianImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/GuardianImpl.java
@@ -276,6 +276,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -314,6 +315,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.GUARDIAN__ID);

@@ -326,6 +328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -355,6 +358,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -380,6 +384,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.GUARDIAN__ADDR);

@@ -392,6 +397,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.GUARDIAN__TELECOM);

@@ -404,6 +410,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Person getGuardianPerson() {

 		return guardianPerson;

 	}

@@ -433,6 +440,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setGuardianPerson(Person newGuardianPerson) {

 		if (newGuardianPerson != guardianPerson) {

 			NotificationChain msgs = null;

@@ -461,6 +469,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization getGuardianOrganization() {

 		return guardianOrganization;

 	}

@@ -492,6 +501,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setGuardianOrganization(Organization newGuardianOrganization) {

 		if (newGuardianOrganization != guardianOrganization) {

 			NotificationChain msgs = null;

@@ -530,6 +540,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -550,6 +561,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -568,6 +580,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -587,6 +600,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClass newClassCode) {

 		RoleClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -607,6 +621,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -625,6 +640,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -852,7 +868,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/HealthCareFacilityImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/HealthCareFacilityImpl.java
index 34bd694..8dc314c 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/HealthCareFacilityImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/HealthCareFacilityImpl.java
@@ -249,6 +249,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -289,6 +290,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.HEALTH_CARE_FACILITY__ID);

@@ -301,6 +303,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -330,6 +333,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -356,6 +360,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Place getLocation() {

 		return location;

 	}

@@ -385,6 +390,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLocation(Place newLocation) {

 		if (newLocation != location) {

 			NotificationChain msgs = null;

@@ -412,6 +418,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization getServiceProviderOrganization() {

 		return serviceProviderOrganization;

 	}

@@ -443,6 +450,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setServiceProviderOrganization(Organization newServiceProviderOrganization) {

 		if (newServiceProviderOrganization != serviceProviderOrganization) {

 			NotificationChain msgs = null;

@@ -483,6 +491,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -503,6 +512,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -521,6 +531,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -540,6 +551,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassServiceDeliveryLocation newClassCode) {

 		RoleClassServiceDeliveryLocation oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -560,6 +572,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassServiceDeliveryLocation oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -578,6 +591,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -761,7 +775,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InFulfillmentOf1Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InFulfillmentOf1Impl.java
index a2bda8f..3405697 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InFulfillmentOf1Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InFulfillmentOf1Impl.java
@@ -197,6 +197,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -247,6 +248,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -274,6 +276,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipFulfills newTypeCode) {

 		ActRelationshipFulfills oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -294,6 +297,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipFulfills oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -312,6 +316,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -321,6 +326,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ActReference getActReference() {

 		return actReference;

 	}

@@ -350,6 +356,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setActReference(ActReference newActReference) {

 		if (newActReference != actReference) {

 			NotificationChain msgs = null;

@@ -515,7 +522,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		result.append(nullFlavor);

 		result.append(", typeCode: ");

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InFulfillmentOfImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InFulfillmentOfImpl.java
index f3ea237..a8aa0de 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InFulfillmentOfImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InFulfillmentOfImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -257,6 +258,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Order getOrder() {

 		return order;

 	}

@@ -286,6 +288,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setOrder(Order newOrder) {

 		if (newOrder != order) {

 			NotificationChain msgs = null;

@@ -322,6 +325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -342,6 +346,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -360,6 +365,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -379,6 +385,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipFulfills newTypeCode) {

 		ActRelationshipFulfills oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -399,6 +406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipFulfills oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -417,6 +425,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -572,7 +581,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Informant12Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Informant12Impl.java
index caa5cc8..057f715 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Informant12Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Informant12Impl.java
@@ -260,6 +260,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -299,6 +300,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity getAssignedEntity() {

 		return assignedEntity;

 	}

@@ -328,6 +330,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedEntity(AssignedEntity newAssignedEntity) {

 		if (newAssignedEntity != assignedEntity) {

 			NotificationChain msgs = null;

@@ -356,6 +359,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RelatedEntity getRelatedEntity() {

 		return relatedEntity;

 	}

@@ -385,6 +389,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRelatedEntity(RelatedEntity newRelatedEntity) {

 		if (newRelatedEntity != relatedEntity) {

 			NotificationChain msgs = null;

@@ -423,6 +428,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -443,6 +449,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -461,6 +468,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -480,6 +488,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -500,6 +509,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -518,6 +528,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -527,6 +538,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ContextControl getContextControlCode() {

 		return contextControlCode;

 	}

@@ -536,6 +548,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextControlCode(ContextControl newContextControlCode) {

 		ContextControl oldContextControlCode = contextControlCode;

 		contextControlCode = newContextControlCode == null

@@ -556,6 +569,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextControlCode() {

 		ContextControl oldContextControlCode = contextControlCode;

 		boolean oldContextControlCodeESet = contextControlCodeESet;

@@ -574,6 +588,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextControlCode() {

 		return contextControlCodeESet;

 	}

@@ -769,7 +784,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InformationRecipientImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InformationRecipientImpl.java
index c4ed4e4..263d739 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InformationRecipientImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InformationRecipientImpl.java
@@ -214,6 +214,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -255,6 +256,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IntendedRecipient getIntendedRecipient() {

 		return intendedRecipient;

 	}

@@ -285,6 +287,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setIntendedRecipient(IntendedRecipient newIntendedRecipient) {

 		if (newIntendedRecipient != intendedRecipient) {

 			NotificationChain msgs = null;

@@ -323,6 +326,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -343,6 +347,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -361,6 +366,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -380,6 +386,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(x_InformationRecipient newTypeCode) {

 		x_InformationRecipient oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -400,6 +407,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		x_InformationRecipient oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -418,6 +426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -564,7 +573,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InfrastructureRootTypeIdImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InfrastructureRootTypeIdImpl.java
index ac26efd..c3c631c 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InfrastructureRootTypeIdImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/InfrastructureRootTypeIdImpl.java
@@ -305,7 +305,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (redefinedRoot: ");

 		if (redefinedRootESet) {

 			result.append(redefinedRoot);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/IntendedRecipientImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/IntendedRecipientImpl.java
index 9631b8c..8ae48a2 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/IntendedRecipientImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/IntendedRecipientImpl.java
@@ -261,6 +261,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -301,6 +302,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.INTENDED_RECIPIENT__ID);

@@ -313,6 +315,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.INTENDED_RECIPIENT__ADDR);

@@ -325,6 +328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.INTENDED_RECIPIENT__TELECOM);

@@ -337,6 +341,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Person getInformationRecipient() {

 		return informationRecipient;

 	}

@@ -367,6 +372,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setInformationRecipient(Person newInformationRecipient) {

 		if (newInformationRecipient != informationRecipient) {

 			NotificationChain msgs = null;

@@ -395,6 +401,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization getReceivedOrganization() {

 		return receivedOrganization;

 	}

@@ -426,6 +433,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setReceivedOrganization(Organization newReceivedOrganization) {

 		if (newReceivedOrganization != receivedOrganization) {

 			NotificationChain msgs = null;

@@ -464,6 +472,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -484,6 +493,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -502,6 +512,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -521,6 +532,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(x_InformationRecipientRole newClassCode) {

 		x_InformationRecipientRole oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -541,6 +553,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		x_InformationRecipientRole oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -559,6 +572,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -756,7 +770,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LabeledDrugImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LabeledDrugImpl.java
index 6bba706..8f4e32a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LabeledDrugImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LabeledDrugImpl.java
@@ -260,6 +260,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -299,6 +300,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -328,6 +330,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -353,6 +356,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EN getName() {

 		return name;

 	}

@@ -382,6 +386,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setName(EN newName) {

 		if (newName != name) {

 			NotificationChain msgs = null;

@@ -417,6 +422,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -437,6 +443,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -455,6 +462,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -474,6 +482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassManufacturedMaterial newClassCode) {

 		EntityClassManufacturedMaterial oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -494,6 +503,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassManufacturedMaterial oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -512,6 +522,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -531,6 +542,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminerDetermined newDeterminerCode) {

 		EntityDeterminerDetermined oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -551,6 +563,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminerDetermined oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -569,6 +582,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -755,7 +769,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LanguageCommunicationImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LanguageCommunicationImpl.java
index 6683ddf..118611a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LanguageCommunicationImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LanguageCommunicationImpl.java
@@ -174,6 +174,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CS> getRealmCodes() {

 		if (realmCodes == null) {

 			realmCodes = new EObjectContainmentEList<CS>(CS.class, this, CDAPackage.LANGUAGE_COMMUNICATION__REALM_CODE);

@@ -186,6 +187,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public InfrastructureRootTypeId getTypeId() {

 		return typeId;

 	}

@@ -215,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -242,6 +245,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getTemplateIds() {

 		if (templateIds == null) {

 			templateIds = new EObjectContainmentEList<II>(

@@ -255,6 +259,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -285,6 +290,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -313,6 +319,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getModeCode() {

 		return modeCode;

 	}

@@ -342,6 +349,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setModeCode(CE newModeCode) {

 		if (newModeCode != modeCode) {

 			NotificationChain msgs = null;

@@ -369,6 +377,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getProficiencyLevelCode() {

 		return proficiencyLevelCode;

 	}

@@ -399,6 +408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setProficiencyLevelCode(CE newProficiencyLevelCode) {

 		if (newProficiencyLevelCode != proficiencyLevelCode) {

 			NotificationChain msgs = null;

@@ -429,6 +439,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public BL getPreferenceInd() {

 		return preferenceInd;

 	}

@@ -459,6 +470,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPreferenceInd(BL newPreferenceInd) {

 		if (newPreferenceInd != preferenceInd) {

 			NotificationChain msgs = null;

@@ -487,6 +499,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public NullFlavor getNullFlavor() {

 		return nullFlavor;

 	}

@@ -496,6 +509,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -516,6 +530,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -534,6 +549,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -706,7 +722,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LegalAuthenticatorImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LegalAuthenticatorImpl.java
index 421aafb..b2d4b4d 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LegalAuthenticatorImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LegalAuthenticatorImpl.java
@@ -283,6 +283,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -323,6 +324,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getTime() {

 		return time;

 	}

@@ -352,6 +354,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -378,6 +381,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getSignatureCode() {

 		return signatureCode;

 	}

@@ -408,6 +412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSignatureCode(CS newSignatureCode) {

 		if (newSignatureCode != signatureCode) {

 			NotificationChain msgs = null;

@@ -436,6 +441,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity getAssignedEntity() {

 		return assignedEntity;

 	}

@@ -466,6 +472,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedEntity(AssignedEntity newAssignedEntity) {

 		if (newAssignedEntity != assignedEntity) {

 			NotificationChain msgs = null;

@@ -504,6 +511,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -524,6 +532,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -542,6 +551,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -561,6 +571,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -581,6 +592,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -599,6 +611,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -608,6 +621,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ContextControl getContextControlCode() {

 		return contextControlCode;

 	}

@@ -617,6 +631,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextControlCode(ContextControl newContextControlCode) {

 		ContextControl oldContextControlCode = contextControlCode;

 		contextControlCode = newContextControlCode == null

@@ -637,6 +652,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextControlCode() {

 		ContextControl oldContextControlCode = contextControlCode;

 		boolean oldContextControlCodeESet = contextControlCodeESet;

@@ -655,6 +671,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextControlCode() {

 		return contextControlCodeESet;

 	}

@@ -664,6 +681,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getSDTCSignatureText() {

 		return sDTCSignatureText;

 	}

@@ -694,6 +712,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCSignatureText(ED newSDTCSignatureText) {

 		if (newSDTCSignatureText != sDTCSignatureText) {

 			NotificationChain msgs = null;

@@ -923,7 +942,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LocationImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LocationImpl.java
index a556d6e..c2d69bd 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LocationImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/LocationImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -255,6 +256,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public HealthCareFacility getHealthCareFacility() {

 		return healthCareFacility;

 	}

@@ -286,6 +288,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setHealthCareFacility(HealthCareFacility newHealthCareFacility) {

 		if (newHealthCareFacility != healthCareFacility) {

 			NotificationChain msgs = null;

@@ -324,6 +327,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -344,6 +348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -362,6 +367,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -381,6 +387,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationTargetLocation newTypeCode) {

 		ParticipationTargetLocation oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -400,6 +407,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationTargetLocation oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -418,6 +426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -573,7 +582,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/MaintainedEntityImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/MaintainedEntityImpl.java
index c95ad2c..fe187ee 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/MaintainedEntityImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/MaintainedEntityImpl.java
@@ -229,6 +229,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -269,6 +270,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -299,6 +301,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -327,6 +330,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Person getMaintainingPerson() {

 		return maintainingPerson;

 	}

@@ -357,6 +361,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMaintainingPerson(Person newMaintainingPerson) {

 		if (newMaintainingPerson != maintainingPerson) {

 			NotificationChain msgs = null;

@@ -395,6 +400,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -415,6 +421,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -433,6 +440,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -452,6 +460,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClass newClassCode) {

 		RoleClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -472,6 +481,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -490,6 +500,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -657,7 +668,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ManufacturedProductImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ManufacturedProductImpl.java
index cccc597..67cc0de 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ManufacturedProductImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ManufacturedProductImpl.java
@@ -252,6 +252,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -292,6 +293,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.MANUFACTURED_PRODUCT__ID);

@@ -304,6 +306,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public LabeledDrug getManufacturedLabeledDrug() {

 		return manufacturedLabeledDrug;

 	}

@@ -335,6 +338,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setManufacturedLabeledDrug(LabeledDrug newManufacturedLabeledDrug) {

 		if (newManufacturedLabeledDrug != manufacturedLabeledDrug) {

 			NotificationChain msgs = null;

@@ -365,6 +369,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Material getManufacturedMaterial() {

 		return manufacturedMaterial;

 	}

@@ -395,6 +400,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setManufacturedMaterial(Material newManufacturedMaterial) {

 		if (newManufacturedMaterial != manufacturedMaterial) {

 			NotificationChain msgs = null;

@@ -423,6 +429,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization getManufacturerOrganization() {

 		return manufacturerOrganization;

 	}

@@ -454,6 +461,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setManufacturerOrganization(Organization newManufacturerOrganization) {

 		if (newManufacturerOrganization != manufacturerOrganization) {

 			NotificationChain msgs = null;

@@ -494,6 +502,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -514,6 +523,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -532,6 +542,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -551,6 +562,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassManufacturedProduct newClassCode) {

 		RoleClassManufacturedProduct oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -571,6 +583,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassManufacturedProduct oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -589,6 +602,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -790,7 +804,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/MaterialImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/MaterialImpl.java
index 7cc9f9f..437b9fe 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/MaterialImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/MaterialImpl.java
@@ -272,6 +272,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -310,6 +311,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -339,6 +341,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -364,6 +367,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EN getName() {

 		return name;

 	}

@@ -393,6 +397,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setName(EN newName) {

 		if (newName != name) {

 			NotificationChain msgs = null;

@@ -418,6 +423,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ST getLotNumberText() {

 		return lotNumberText;

 	}

@@ -447,6 +453,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLotNumberText(ST newLotNumberText) {

 		if (newLotNumberText != lotNumberText) {

 			NotificationChain msgs = null;

@@ -484,6 +491,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -504,6 +512,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -522,6 +531,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -541,6 +551,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassManufacturedMaterial newClassCode) {

 		EntityClassManufacturedMaterial oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -561,6 +572,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassManufacturedMaterial oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -579,6 +591,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -598,6 +611,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminerDetermined newDeterminerCode) {

 		EntityDeterminerDetermined oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -618,6 +632,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminerDetermined oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -636,6 +651,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -834,7 +850,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/NonXMLBodyImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/NonXMLBodyImpl.java
index 6377566..c8b10fa 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/NonXMLBodyImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/NonXMLBodyImpl.java
@@ -271,6 +271,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -310,6 +311,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -339,6 +341,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -364,6 +367,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getConfidentialityCode() {

 		return confidentialityCode;

 	}

@@ -394,6 +398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setConfidentialityCode(CE newConfidentialityCode) {

 		if (newConfidentialityCode != confidentialityCode) {

 			NotificationChain msgs = null;

@@ -422,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -451,6 +457,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -488,6 +495,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -508,6 +516,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -526,6 +535,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -545,6 +555,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -565,6 +576,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -583,6 +595,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -602,6 +615,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -622,6 +636,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -640,6 +655,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -838,7 +854,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationImpl.java
index acc6f6c..20a9795 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationImpl.java
@@ -544,6 +544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -583,6 +584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.OBSERVATION__ID);

@@ -595,6 +597,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -624,6 +627,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -649,6 +653,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ST getDerivationExpr() {

 		return derivationExpr;

 	}

@@ -678,6 +683,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDerivationExpr(ST newDerivationExpr) {

 		if (newDerivationExpr != derivationExpr) {

 			NotificationChain msgs = null;

@@ -706,6 +712,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -735,6 +742,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -760,6 +768,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -789,6 +798,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -816,6 +826,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -845,6 +856,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -873,6 +885,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getPriorityCode() {

 		return priorityCode;

 	}

@@ -902,6 +915,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPriorityCode(CE newPriorityCode) {

 		if (newPriorityCode != priorityCode) {

 			NotificationChain msgs = null;

@@ -929,6 +943,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_INT getRepeatNumber() {

 		return repeatNumber;

 	}

@@ -958,6 +973,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRepeatNumber(IVL_INT newRepeatNumber) {

 		if (newRepeatNumber != repeatNumber) {

 			NotificationChain msgs = null;

@@ -985,6 +1001,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -1014,6 +1031,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -1041,6 +1059,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<ANY> getValues() {

 		if (values == null) {

 			values = new EObjectContainmentEList<ANY>(ANY.class, this, CDAPackage.OBSERVATION__VALUE);

@@ -1053,6 +1072,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getInterpretationCodes() {

 		if (interpretationCodes == null) {

 			interpretationCodes = new EObjectContainmentEList<CE>(

@@ -1066,6 +1086,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getMethodCodes() {

 		if (methodCodes == null) {

 			methodCodes = new EObjectContainmentEList<CE>(CE.class, this, CDAPackage.OBSERVATION__METHOD_CODE);

@@ -1078,6 +1099,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CD> getTargetSiteCodes() {

 		if (targetSiteCodes == null) {

 			targetSiteCodes = new EObjectContainmentEList<CD>(CD.class, this, CDAPackage.OBSERVATION__TARGET_SITE_CODE);

@@ -1090,6 +1112,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -1119,6 +1142,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -1145,6 +1169,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(Specimen.class, this, CDAPackage.OBSERVATION__SPECIMEN);

@@ -1157,6 +1182,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(

@@ -1170,6 +1196,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.OBSERVATION__AUTHOR);

@@ -1182,6 +1209,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -1195,6 +1223,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -1208,6 +1237,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EntryRelationship> getEntryRelationships() {

 		if (entryRelationships == null) {

 			entryRelationships = new EObjectContainmentEList<EntryRelationship>(

@@ -1221,6 +1251,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(

@@ -1234,6 +1265,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -1247,6 +1279,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<ReferenceRange> getReferenceRanges() {

 		if (referenceRanges == null) {

 			referenceRanges = new EObjectContainmentEList<ReferenceRange>(

@@ -1270,6 +1303,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -1290,6 +1324,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -1308,6 +1343,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1327,6 +1363,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassObservation newClassCode) {

 		ActClassObservation oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1347,6 +1384,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassObservation oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1365,6 +1403,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1384,6 +1423,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(x_ActMoodDocumentObservation newMoodCode) {

 		x_ActMoodDocumentObservation oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -1404,6 +1444,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		x_ActMoodDocumentObservation oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -1422,6 +1463,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1441,6 +1483,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNegationInd(Boolean newNegationInd) {

 		Boolean oldNegationInd = negationInd;

 		negationInd = newNegationInd;

@@ -1459,6 +1502,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNegationInd() {

 		Boolean oldNegationInd = negationInd;

 		boolean oldNegationIndESet = negationIndESet;

@@ -1477,6 +1521,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNegationInd() {

 		return negationIndESet;

 	}

@@ -1486,6 +1531,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<InFulfillmentOf1> getInFulfillmentOf1s() {

 		if (inFulfillmentOf1s == null) {

 			inFulfillmentOf1s = new EObjectContainmentEList<InFulfillmentOf1>(

@@ -1947,7 +1993,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationMediaImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationMediaImpl.java
index 8e4399a..9b2c763 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationMediaImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationMediaImpl.java
@@ -395,6 +395,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -435,6 +436,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.OBSERVATION_MEDIA__ID);

@@ -447,6 +449,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -476,6 +479,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -504,6 +508,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getValue() {

 		return value;

 	}

@@ -533,6 +538,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setValue(ED newValue) {

 		if (newValue != value) {

 			NotificationChain msgs = null;

@@ -559,6 +565,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -588,6 +595,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -615,6 +623,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(

@@ -628,6 +637,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(

@@ -641,6 +651,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.OBSERVATION_MEDIA__AUTHOR);

@@ -653,6 +664,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -666,6 +678,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -679,6 +692,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EntryRelationship> getEntryRelationships() {

 		if (entryRelationships == null) {

 			entryRelationships = new EObjectContainmentEList<EntryRelationship>(

@@ -692,6 +706,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(

@@ -705,6 +720,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -718,6 +734,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public String getObservationMediaId() {

 		return observationMediaId;

 	}

@@ -727,6 +744,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setObservationMediaId(String newObservationMediaId) {

 		String oldObservationMediaId = observationMediaId;

 		observationMediaId = newObservationMediaId;

@@ -753,6 +771,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -773,6 +792,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -791,6 +811,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -810,6 +831,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassObservation newClassCode) {

 		ActClassObservation oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -830,6 +852,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassObservation oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -848,6 +871,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -867,6 +891,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -887,6 +912,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -905,6 +931,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1214,7 +1241,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (observationMediaId: ");

 		result.append(observationMediaId);

 		result.append(", nullFlavor: ");

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationRangeImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationRangeImpl.java
index 1b18218..7ea9661 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationRangeImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ObservationRangeImpl.java
@@ -284,6 +284,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -324,6 +325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -353,6 +355,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -379,6 +382,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -408,6 +412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -434,6 +439,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ANY getValue() {

 		return value;

 	}

@@ -463,6 +469,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setValue(ANY newValue) {

 		if (newValue != value) {

 			NotificationChain msgs = null;

@@ -489,6 +496,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getInterpretationCode() {

 		return interpretationCode;

 	}

@@ -519,6 +527,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setInterpretationCode(CE newInterpretationCode) {

 		if (newInterpretationCode != interpretationCode) {

 			NotificationChain msgs = null;

@@ -557,6 +566,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -577,6 +587,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -595,6 +606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -614,6 +626,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassObservation newClassCode) {

 		ActClassObservation oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -634,6 +647,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassObservation oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -652,6 +666,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -671,6 +686,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -691,6 +707,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -709,6 +726,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -910,7 +928,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrderImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrderImpl.java
index ea6f014..d82ab63 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrderImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrderImpl.java
@@ -270,6 +270,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -308,6 +309,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ORDER__ID);

@@ -320,6 +322,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -349,6 +352,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -374,6 +378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getPriorityCode() {

 		return priorityCode;

 	}

@@ -403,6 +408,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPriorityCode(CE newPriorityCode) {

 		if (newPriorityCode != priorityCode) {

 			NotificationChain msgs = null;

@@ -440,6 +446,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -460,6 +467,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -478,6 +486,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -497,6 +506,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassRoot newClassCode) {

 		ActClassRoot oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -516,6 +526,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassRoot oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -534,6 +545,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -553,6 +565,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -572,6 +585,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -590,6 +604,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -780,7 +795,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizationImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizationImpl.java
index e47a90a..d411042 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizationImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizationImpl.java
@@ -307,6 +307,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -346,6 +347,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ORGANIZATION__ID);

@@ -358,6 +360,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<ON> getNames() {

 		if (names == null) {

 			names = new EObjectContainmentEList<ON>(ON.class, this, CDAPackage.ORGANIZATION__NAME);

@@ -370,6 +373,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.ORGANIZATION__TELECOM);

@@ -382,6 +386,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.ORGANIZATION__ADDR);

@@ -394,6 +399,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getStandardIndustryClassCode() {

 		return standardIndustryClassCode;

 	}

@@ -425,6 +431,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStandardIndustryClassCode(CE newStandardIndustryClassCode) {

 		if (newStandardIndustryClassCode != standardIndustryClassCode) {

 			NotificationChain msgs = null;

@@ -453,6 +460,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public OrganizationPartOf getAsOrganizationPartOf() {

 		return asOrganizationPartOf;

 	}

@@ -484,6 +492,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAsOrganizationPartOf(OrganizationPartOf newAsOrganizationPartOf) {

 		if (newAsOrganizationPartOf != asOrganizationPartOf) {

 			NotificationChain msgs = null;

@@ -522,6 +531,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -542,6 +552,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -560,6 +571,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -579,6 +591,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassOrganization newClassCode) {

 		EntityClassOrganization oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -599,6 +612,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassOrganization oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -617,6 +631,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -636,6 +651,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -656,6 +672,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -674,6 +691,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -912,7 +930,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizationPartOfImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizationPartOfImpl.java
index 44617b9..7c0ba21 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizationPartOfImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizationPartOfImpl.java
@@ -263,6 +263,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -303,6 +304,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ORGANIZATION_PART_OF__ID);

@@ -315,6 +317,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -344,6 +347,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -370,6 +374,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -399,6 +404,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -427,6 +433,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -457,6 +464,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -485,6 +493,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization getWholeOrganization() {

 		return wholeOrganization;

 	}

@@ -515,6 +524,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setWholeOrganization(Organization newWholeOrganization) {

 		if (newWholeOrganization != wholeOrganization) {

 			NotificationChain msgs = null;

@@ -553,6 +563,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -573,6 +584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -591,6 +603,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -610,6 +623,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClass newClassCode) {

 		RoleClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -630,6 +644,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -648,6 +663,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -852,7 +868,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizerImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizerImpl.java
index a97acf4..fd35cb4 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizerImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/OrganizerImpl.java
@@ -397,6 +397,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -435,6 +436,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.ORGANIZER__ID);

@@ -447,6 +449,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -476,6 +479,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -501,6 +505,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -530,6 +535,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -557,6 +563,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -586,6 +593,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -613,6 +621,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -642,6 +651,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -668,6 +678,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(Specimen.class, this, CDAPackage.ORGANIZER__SPECIMEN);

@@ -680,6 +691,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(

@@ -693,6 +705,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.ORGANIZER__AUTHOR);

@@ -705,6 +718,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -718,6 +732,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -731,6 +746,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(Reference.class, this, CDAPackage.ORGANIZER__REFERENCE);

@@ -743,6 +759,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -756,6 +773,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Component4> getComponents() {

 		if (components == null) {

 			components = new EObjectContainmentEList<Component4>(

@@ -779,6 +797,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -799,6 +818,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -817,6 +837,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -836,6 +857,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(x_ActClassDocumentEntryOrganizer newClassCode) {

 		x_ActClassDocumentEntryOrganizer oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -856,6 +878,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		x_ActClassDocumentEntryOrganizer oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -874,6 +897,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -893,6 +917,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -912,6 +937,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -930,6 +956,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1440,7 +1467,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ParentDocumentImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ParentDocumentImpl.java
index fc49d3c..5537ab3 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ParentDocumentImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ParentDocumentImpl.java
@@ -294,6 +294,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -334,6 +335,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.PARENT_DOCUMENT__ID);

@@ -346,6 +348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -375,6 +378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -400,6 +404,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -429,6 +434,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -454,6 +460,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public II getSetId() {

 		return setId;

 	}

@@ -483,6 +490,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSetId(II newSetId) {

 		if (newSetId != setId) {

 			NotificationChain msgs = null;

@@ -509,6 +517,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public INT getVersionNumber() {

 		return versionNumber;

 	}

@@ -538,6 +547,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setVersionNumber(INT newVersionNumber) {

 		if (newVersionNumber != versionNumber) {

 			NotificationChain msgs = null;

@@ -576,6 +586,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -596,6 +607,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -614,6 +626,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -633,6 +646,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClinicalDocument newClassCode) {

 		ActClinicalDocument oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -653,6 +667,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClinicalDocument oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -671,6 +686,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -690,6 +706,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -710,6 +727,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -728,6 +746,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -951,7 +970,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Participant1Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Participant1Impl.java
index 752edf3..c832392 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Participant1Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Participant1Impl.java
@@ -272,6 +272,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -311,6 +312,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getFunctionCode() {

 		return functionCode;

 	}

@@ -340,6 +342,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setFunctionCode(CE newFunctionCode) {

 		if (newFunctionCode != functionCode) {

 			NotificationChain msgs = null;

@@ -367,6 +370,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getTime() {

 		return time;

 	}

@@ -396,6 +400,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(IVL_TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -421,6 +426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssociatedEntity getAssociatedEntity() {

 		return associatedEntity;

 	}

@@ -451,6 +457,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssociatedEntity(AssociatedEntity newAssociatedEntity) {

 		if (newAssociatedEntity != associatedEntity) {

 			NotificationChain msgs = null;

@@ -489,6 +496,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -509,6 +517,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -527,6 +536,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -546,6 +556,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -566,6 +577,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -584,6 +596,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -593,6 +606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ContextControl getContextControlCode() {

 		return contextControlCode;

 	}

@@ -602,6 +616,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextControlCode(ContextControl newContextControlCode) {

 		ContextControl oldContextControlCode = contextControlCode;

 		contextControlCode = newContextControlCode == null

@@ -622,6 +637,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextControlCode() {

 		ContextControl oldContextControlCode = contextControlCode;

 		boolean oldContextControlCodeESet = contextControlCodeESet;

@@ -640,6 +656,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextControlCode() {

 		return contextControlCodeESet;

 	}

@@ -829,7 +846,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Participant2Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Participant2Impl.java
index d68fc9c..9cf2654 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Participant2Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Participant2Impl.java
@@ -283,6 +283,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -322,6 +323,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getTime() {

 		return time;

 	}

@@ -351,6 +353,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(IVL_TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -376,6 +379,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getAwarenessCode() {

 		return awarenessCode;

 	}

@@ -405,6 +409,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAwarenessCode(CE newAwarenessCode) {

 		if (newAwarenessCode != awarenessCode) {

 			NotificationChain msgs = null;

@@ -433,6 +438,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ParticipantRole getParticipantRole() {

 		return participantRole;

 	}

@@ -463,6 +469,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setParticipantRole(ParticipantRole newParticipantRole) {

 		if (newParticipantRole != participantRole) {

 			NotificationChain msgs = null;

@@ -501,6 +508,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -521,6 +529,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -539,6 +548,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -558,6 +568,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -578,6 +589,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -596,6 +608,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -605,6 +618,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ContextControl getContextControlCode() {

 		return contextControlCode;

 	}

@@ -614,6 +628,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextControlCode(ContextControl newContextControlCode) {

 		ContextControl oldContextControlCode = contextControlCode;

 		contextControlCode = newContextControlCode == null

@@ -634,6 +649,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextControlCode() {

 		ContextControl oldContextControlCode = contextControlCode;

 		boolean oldContextControlCodeESet = contextControlCodeESet;

@@ -652,6 +668,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextControlCode() {

 		return contextControlCodeESet;

 	}

@@ -661,6 +678,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getSDTCFunctionCode() {

 		return sDTCFunctionCode;

 	}

@@ -691,6 +709,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCFunctionCode(CE newSDTCFunctionCode) {

 		if (newSDTCFunctionCode != sDTCFunctionCode) {

 			NotificationChain msgs = null;

@@ -911,7 +930,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ParticipantRoleImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ParticipantRoleImpl.java
index 607ad04..f2bb1b9 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ParticipantRoleImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ParticipantRoleImpl.java
@@ -288,6 +288,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -328,6 +329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.PARTICIPANT_ROLE__ID);

@@ -340,6 +342,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -369,6 +372,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -394,6 +398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.PARTICIPANT_ROLE__ADDR);

@@ -406,6 +411,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.PARTICIPANT_ROLE__TELECOM);

@@ -418,6 +424,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Device getPlayingDevice() {

 		return playingDevice;

 	}

@@ -448,6 +455,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPlayingDevice(Device newPlayingDevice) {

 		if (newPlayingDevice != playingDevice) {

 			NotificationChain msgs = null;

@@ -476,6 +484,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public PlayingEntity getPlayingEntity() {

 		return playingEntity;

 	}

@@ -506,6 +515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPlayingEntity(PlayingEntity newPlayingEntity) {

 		if (newPlayingEntity != playingEntity) {

 			NotificationChain msgs = null;

@@ -534,6 +544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Entity getScopingEntity() {

 		return scopingEntity;

 	}

@@ -564,6 +575,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setScopingEntity(Entity newScopingEntity) {

 		if (newScopingEntity != scopingEntity) {

 			NotificationChain msgs = null;

@@ -602,6 +614,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -622,6 +635,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -640,6 +654,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -659,6 +674,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassRoot newClassCode) {

 		RoleClassRoot oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -679,6 +695,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassRoot oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -697,6 +714,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -927,7 +945,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PatientImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PatientImpl.java
index 6395184..7a02221 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PatientImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PatientImpl.java
@@ -385,6 +385,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -423,6 +424,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public II getId() {

 		return id;

 	}

@@ -452,6 +454,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setId(II newId) {

 		if (newId != id) {

 			NotificationChain msgs = null;

@@ -477,6 +480,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<PN> getNames() {

 		if (names == null) {

 			names = new EObjectContainmentEList<PN>(PN.class, this, CDAPackage.PATIENT__NAME);

@@ -489,6 +493,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getAdministrativeGenderCode() {

 		return administrativeGenderCode;

 	}

@@ -519,6 +524,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAdministrativeGenderCode(CE newAdministrativeGenderCode) {

 		if (newAdministrativeGenderCode != administrativeGenderCode) {

 			NotificationChain msgs = null;

@@ -547,6 +553,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getBirthTime() {

 		return birthTime;

 	}

@@ -576,6 +583,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setBirthTime(TS newBirthTime) {

 		if (newBirthTime != birthTime) {

 			NotificationChain msgs = null;

@@ -603,6 +611,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getMaritalStatusCode() {

 		return maritalStatusCode;

 	}

@@ -633,6 +642,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMaritalStatusCode(CE newMaritalStatusCode) {

 		if (newMaritalStatusCode != maritalStatusCode) {

 			NotificationChain msgs = null;

@@ -661,6 +671,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getReligiousAffiliationCode() {

 		return religiousAffiliationCode;

 	}

@@ -691,6 +702,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setReligiousAffiliationCode(CE newReligiousAffiliationCode) {

 		if (newReligiousAffiliationCode != religiousAffiliationCode) {

 			NotificationChain msgs = null;

@@ -719,6 +731,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getRaceCode() {

 		return raceCode;

 	}

@@ -748,6 +761,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRaceCode(CE newRaceCode) {

 		if (newRaceCode != raceCode) {

 			NotificationChain msgs = null;

@@ -774,6 +788,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getSDTCRaceCodes() {

 		if (sDTCRaceCodes == null) {

 			sDTCRaceCodes = new EObjectContainmentEList<CE>(CE.class, this, CDAPackage.PATIENT__SDTC_RACE_CODE);

@@ -786,6 +801,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getEthnicGroupCode() {

 		return ethnicGroupCode;

 	}

@@ -815,6 +831,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEthnicGroupCode(CE newEthnicGroupCode) {

 		if (newEthnicGroupCode != ethnicGroupCode) {

 			NotificationChain msgs = null;

@@ -843,6 +860,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Guardian> getGuardians() {

 		if (guardians == null) {

 			guardians = new EObjectContainmentEList<Guardian>(Guardian.class, this, CDAPackage.PATIENT__GUARDIAN);

@@ -855,6 +873,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Birthplace getBirthplace() {

 		return birthplace;

 	}

@@ -884,6 +903,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setBirthplace(Birthplace newBirthplace) {

 		if (newBirthplace != birthplace) {

 			NotificationChain msgs = null;

@@ -911,6 +931,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<LanguageCommunication> getLanguageCommunications() {

 		if (languageCommunications == null) {

 			languageCommunications = new EObjectContainmentEList<LanguageCommunication>(

@@ -924,6 +945,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getSDTCEthnicGroupCodes() {

 		if (sDTCEthnicGroupCodes == null) {

 			sDTCEthnicGroupCodes = new EObjectContainmentEList<CE>(

@@ -947,6 +969,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -967,6 +990,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -985,6 +1009,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1004,6 +1029,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClass newClassCode) {

 		EntityClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1024,6 +1050,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1042,6 +1069,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1061,6 +1089,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -1081,6 +1110,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -1099,6 +1129,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -1431,7 +1462,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PatientRoleImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PatientRoleImpl.java
index 7013772..ff0057e 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PatientRoleImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PatientRoleImpl.java
@@ -264,6 +264,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -303,6 +304,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.PATIENT_ROLE__ID);

@@ -315,6 +317,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.PATIENT_ROLE__ADDR);

@@ -327,6 +330,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.PATIENT_ROLE__TELECOM);

@@ -339,6 +343,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Patient getPatient() {

 		return patient;

 	}

@@ -368,6 +373,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPatient(Patient newPatient) {

 		if (newPatient != patient) {

 			NotificationChain msgs = null;

@@ -395,6 +401,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Organization getProviderOrganization() {

 		return providerOrganization;

 	}

@@ -426,6 +433,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setProviderOrganization(Organization newProviderOrganization) {

 		if (newProviderOrganization != providerOrganization) {

 			NotificationChain msgs = null;

@@ -464,6 +472,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -484,6 +493,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -502,6 +512,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -521,6 +532,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClass newClassCode) {

 		RoleClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -541,6 +553,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -559,6 +572,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -765,7 +779,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Performer1Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Performer1Impl.java
index 799835e..f2e2ea2 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Performer1Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Performer1Impl.java
@@ -238,6 +238,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -277,6 +278,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getFunctionCode() {

 		return functionCode;

 	}

@@ -306,6 +308,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setFunctionCode(CE newFunctionCode) {

 		if (newFunctionCode != functionCode) {

 			NotificationChain msgs = null;

@@ -333,6 +336,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getTime() {

 		return time;

 	}

@@ -362,6 +366,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(IVL_TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -387,6 +392,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity getAssignedEntity() {

 		return assignedEntity;

 	}

@@ -416,6 +422,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedEntity(AssignedEntity newAssignedEntity) {

 		if (newAssignedEntity != assignedEntity) {

 			NotificationChain msgs = null;

@@ -454,6 +461,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -474,6 +482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -492,6 +501,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -511,6 +521,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(x_ServiceEventPerformer newTypeCode) {

 		x_ServiceEventPerformer oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -530,6 +541,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		x_ServiceEventPerformer oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -548,6 +560,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -718,7 +731,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Performer2Impl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Performer2Impl.java
index 4ff6f70..db7c636 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Performer2Impl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/Performer2Impl.java
@@ -46,12 +46,12 @@
  *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getRealmCodes <em>Realm Code</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getTypeId <em>Type Id</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getTemplateIds <em>Template Id</em>}</li>

+ *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getSDTCFunctionCode <em>SDTC Function Code</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getTime <em>Time</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getModeCode <em>Mode Code</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getAssignedEntity <em>Assigned Entity</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getNullFlavor <em>Null Flavor</em>}</li>

  *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getTypeCode <em>Type Code</em>}</li>

- *   <li>{@link org.eclipse.mdht.uml.cda.impl.Performer2Impl#getSDTCFunctionCode <em>SDTC Function Code</em>}</li>

  * </ul>

  *

  * @generated

@@ -88,6 +88,16 @@
 	protected EList<II> templateIds;

 

 	/**

+	 * The cached value of the '{@link #getSDTCFunctionCode() <em>SDTC Function Code</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSDTCFunctionCode()

+	 * @generated

+	 * @ordered

+	 */

+	protected CE sDTCFunctionCode;

+

+	/**

 	 * The cached value of the '{@link #getTime() <em>Time</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -176,16 +186,6 @@
 	protected boolean typeCodeESet;

 

 	/**

-	 * The cached value of the '{@link #getSDTCFunctionCode() <em>SDTC Function Code</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getSDTCFunctionCode()

-	 * @generated

-	 * @ordered

-	 */

-	protected CE sDTCFunctionCode;

-

-	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

@@ -252,6 +252,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -291,6 +292,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getTime() {

 		return time;

 	}

@@ -320,6 +322,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTime(IVL_TS newTime) {

 		if (newTime != time) {

 			NotificationChain msgs = null;

@@ -345,6 +348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getModeCode() {

 		return modeCode;

 	}

@@ -374,6 +378,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setModeCode(CE newModeCode) {

 		if (newModeCode != modeCode) {

 			NotificationChain msgs = null;

@@ -401,6 +406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity getAssignedEntity() {

 		return assignedEntity;

 	}

@@ -430,6 +436,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedEntity(AssignedEntity newAssignedEntity) {

 		if (newAssignedEntity != assignedEntity) {

 			NotificationChain msgs = null;

@@ -468,6 +475,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -488,6 +496,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -506,6 +515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -525,6 +535,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationPhysicalPerformer newTypeCode) {

 		ParticipationPhysicalPerformer oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -544,6 +555,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationPhysicalPerformer oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -562,6 +574,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -571,6 +584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getSDTCFunctionCode() {

 		return sDTCFunctionCode;

 	}

@@ -601,6 +615,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCFunctionCode(CE newSDTCFunctionCode) {

 		if (newSDTCFunctionCode != sDTCFunctionCode) {

 			NotificationChain msgs = null;

@@ -647,14 +662,14 @@
 				return basicSetTypeId(null, msgs);

 			case CDAPackage.PERFORMER2__TEMPLATE_ID:

 				return ((InternalEList<?>) getTemplateIds()).basicRemove(otherEnd, msgs);

+			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

+				return basicSetSDTCFunctionCode(null, msgs);

 			case CDAPackage.PERFORMER2__TIME:

 				return basicSetTime(null, msgs);

 			case CDAPackage.PERFORMER2__MODE_CODE:

 				return basicSetModeCode(null, msgs);

 			case CDAPackage.PERFORMER2__ASSIGNED_ENTITY:

 				return basicSetAssignedEntity(null, msgs);

-			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

-				return basicSetSDTCFunctionCode(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -673,6 +688,8 @@
 				return getTypeId();

 			case CDAPackage.PERFORMER2__TEMPLATE_ID:

 				return getTemplateIds();

+			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

+				return getSDTCFunctionCode();

 			case CDAPackage.PERFORMER2__TIME:

 				return getTime();

 			case CDAPackage.PERFORMER2__MODE_CODE:

@@ -683,8 +700,6 @@
 				return getNullFlavor();

 			case CDAPackage.PERFORMER2__TYPE_CODE:

 				return getTypeCode();

-			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

-				return getSDTCFunctionCode();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -709,6 +724,9 @@
 				getTemplateIds().clear();

 				getTemplateIds().addAll((Collection<? extends II>) newValue);

 				return;

+			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

+				setSDTCFunctionCode((CE) newValue);

+				return;

 			case CDAPackage.PERFORMER2__TIME:

 				setTime((IVL_TS) newValue);

 				return;

@@ -724,9 +742,6 @@
 			case CDAPackage.PERFORMER2__TYPE_CODE:

 				setTypeCode((ParticipationPhysicalPerformer) newValue);

 				return;

-			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

-				setSDTCFunctionCode((CE) newValue);

-				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -748,6 +763,9 @@
 			case CDAPackage.PERFORMER2__TEMPLATE_ID:

 				getTemplateIds().clear();

 				return;

+			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

+				setSDTCFunctionCode((CE) null);

+				return;

 			case CDAPackage.PERFORMER2__TIME:

 				setTime((IVL_TS) null);

 				return;

@@ -763,9 +781,6 @@
 			case CDAPackage.PERFORMER2__TYPE_CODE:

 				unsetTypeCode();

 				return;

-			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

-				setSDTCFunctionCode((CE) null);

-				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -784,6 +799,8 @@
 				return typeId != null;

 			case CDAPackage.PERFORMER2__TEMPLATE_ID:

 				return templateIds != null && !templateIds.isEmpty();

+			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

+				return sDTCFunctionCode != null;

 			case CDAPackage.PERFORMER2__TIME:

 				return time != null;

 			case CDAPackage.PERFORMER2__MODE_CODE:

@@ -794,8 +811,6 @@
 				return isSetNullFlavor();

 			case CDAPackage.PERFORMER2__TYPE_CODE:

 				return isSetTypeCode();

-			case CDAPackage.PERFORMER2__SDTC_FUNCTION_CODE:

-				return sDTCFunctionCode != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -811,7 +826,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PersonImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PersonImpl.java
index 0724065..f52071a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PersonImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PersonImpl.java
@@ -260,6 +260,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -298,6 +299,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<PN> getNames() {

 		if (names == null) {

 			names = new EObjectContainmentEList<PN>(PN.class, this, CDAPackage.PERSON__NAME);

@@ -310,6 +312,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getSDTCBirthTime() {

 		return sDTCBirthTime;

 	}

@@ -339,6 +342,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCBirthTime(TS newSDTCBirthTime) {

 		if (newSDTCBirthTime != sDTCBirthTime) {

 			NotificationChain msgs = null;

@@ -376,6 +380,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -396,6 +401,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -414,6 +420,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -433,6 +440,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClass newClassCode) {

 		EntityClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -452,6 +460,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -470,6 +479,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -489,6 +499,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -509,6 +520,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -527,6 +539,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -714,7 +727,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PlaceImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PlaceImpl.java
index f6cce8e..487804c 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PlaceImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PlaceImpl.java
@@ -260,6 +260,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -298,6 +299,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EN getName() {

 		return name;

 	}

@@ -327,6 +329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setName(EN newName) {

 		if (newName != name) {

 			NotificationChain msgs = null;

@@ -352,6 +355,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AD getAddr() {

 		return addr;

 	}

@@ -381,6 +385,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAddr(AD newAddr) {

 		if (newAddr != addr) {

 			NotificationChain msgs = null;

@@ -416,6 +421,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -436,6 +442,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -454,6 +461,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -473,6 +481,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassPlace newClassCode) {

 		EntityClassPlace oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -492,6 +501,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassPlace oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -510,6 +520,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -529,6 +540,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -549,6 +561,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -567,6 +580,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -771,7 +785,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PlayingEntityImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PlayingEntityImpl.java
index fbb8cd8..71b8ab0 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PlayingEntityImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PlayingEntityImpl.java
@@ -296,6 +296,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -336,6 +337,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -365,6 +367,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -390,6 +393,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<PQ> getQuantities() {

 		if (quantities == null) {

 			quantities = new EObjectContainmentEList<PQ>(PQ.class, this, CDAPackage.PLAYING_ENTITY__QUANTITY);

@@ -402,6 +406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<PN> getNames() {

 		if (names == null) {

 			names = new EObjectContainmentEList<PN>(PN.class, this, CDAPackage.PLAYING_ENTITY__NAME);

@@ -414,6 +419,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getSDTCBirthTime() {

 		return sDTCBirthTime;

 	}

@@ -443,6 +449,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCBirthTime(TS newSDTCBirthTime) {

 		if (newSDTCBirthTime != sDTCBirthTime) {

 			NotificationChain msgs = null;

@@ -471,6 +478,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getDesc() {

 		return desc;

 	}

@@ -500,6 +508,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDesc(ED newDesc) {

 		if (newDesc != desc) {

 			NotificationChain msgs = null;

@@ -535,6 +544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -555,6 +565,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -573,6 +584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -592,6 +604,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClassRoot newClassCode) {

 		EntityClassRoot oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -612,6 +625,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClassRoot oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -630,6 +644,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -649,6 +664,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -669,6 +685,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -687,6 +704,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -902,7 +920,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PreconditionImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PreconditionImpl.java
index 22e56f2..527984b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PreconditionImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/PreconditionImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -256,6 +257,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Criterion getCriterion() {

 		return criterion;

 	}

@@ -285,6 +287,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCriterion(Criterion newCriterion) {

 		if (newCriterion != criterion) {

 			NotificationChain msgs = null;

@@ -322,6 +325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -342,6 +346,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -360,6 +365,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -379,6 +385,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipType newTypeCode) {

 		ActRelationshipType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -399,6 +406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -417,6 +425,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -572,7 +581,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ProcedureImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ProcedureImpl.java
index e3c44cb..b40b8c0 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ProcedureImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ProcedureImpl.java
@@ -496,6 +496,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -534,6 +535,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.PROCEDURE__ID);

@@ -546,6 +548,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -575,6 +578,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -600,6 +604,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -629,6 +634,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -654,6 +660,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -683,6 +690,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -710,6 +718,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -739,6 +748,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -766,6 +776,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getPriorityCode() {

 		return priorityCode;

 	}

@@ -795,6 +806,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPriorityCode(CE newPriorityCode) {

 		if (newPriorityCode != priorityCode) {

 			NotificationChain msgs = null;

@@ -822,6 +834,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -851,6 +864,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -878,6 +892,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getMethodCodes() {

 		if (methodCodes == null) {

 			methodCodes = new EObjectContainmentEList<CE>(CE.class, this, CDAPackage.PROCEDURE__METHOD_CODE);

@@ -890,6 +905,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CD> getApproachSiteCodes() {

 		if (approachSiteCodes == null) {

 			approachSiteCodes = new EObjectContainmentEList<CD>(

@@ -903,6 +919,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CD> getTargetSiteCodes() {

 		if (targetSiteCodes == null) {

 			targetSiteCodes = new EObjectContainmentEList<CD>(CD.class, this, CDAPackage.PROCEDURE__TARGET_SITE_CODE);

@@ -915,6 +932,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -944,6 +962,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -970,6 +989,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(Specimen.class, this, CDAPackage.PROCEDURE__SPECIMEN);

@@ -982,6 +1002,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(

@@ -995,6 +1016,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.PROCEDURE__AUTHOR);

@@ -1007,6 +1029,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -1020,6 +1043,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -1033,6 +1057,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EntryRelationship> getEntryRelationships() {

 		if (entryRelationships == null) {

 			entryRelationships = new EObjectContainmentEList<EntryRelationship>(

@@ -1046,6 +1071,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(Reference.class, this, CDAPackage.PROCEDURE__REFERENCE);

@@ -1058,6 +1084,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -1071,6 +1098,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<InFulfillmentOf1> getInFulfillmentOf1s() {

 		if (inFulfillmentOf1s == null) {

 			inFulfillmentOf1s = new EObjectContainmentEList<InFulfillmentOf1>(

@@ -1094,6 +1122,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -1114,6 +1143,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -1132,6 +1162,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1151,6 +1182,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1171,6 +1203,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1189,6 +1222,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1208,6 +1242,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(x_DocumentProcedureMood newMoodCode) {

 		x_DocumentProcedureMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -1227,6 +1262,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		x_DocumentProcedureMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -1245,6 +1281,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1264,6 +1301,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNegationInd(Boolean newNegationInd) {

 		Boolean oldNegationInd = negationInd;

 		negationInd = newNegationInd;

@@ -1282,6 +1320,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNegationInd() {

 		Boolean oldNegationInd = negationInd;

 		boolean oldNegationIndESet = negationIndESet;

@@ -1300,6 +1339,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNegationInd() {

 		return negationIndESet;

 	}

@@ -1707,7 +1747,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ProductImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ProductImpl.java
index bf9acb9..5701984 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ProductImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ProductImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -255,6 +256,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ManufacturedProduct getManufacturedProduct() {

 		return manufacturedProduct;

 	}

@@ -286,6 +288,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setManufacturedProduct(ManufacturedProduct newManufacturedProduct) {

 		if (newManufacturedProduct != manufacturedProduct) {

 			NotificationChain msgs = null;

@@ -324,6 +327,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -344,6 +348,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -362,6 +367,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -381,6 +387,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -400,6 +407,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -418,6 +426,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -573,7 +582,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RecordTargetImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RecordTargetImpl.java
index a5502da..f2ab8bf 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RecordTargetImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RecordTargetImpl.java
@@ -248,6 +248,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -287,6 +288,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public PatientRole getPatientRole() {

 		return patientRole;

 	}

@@ -316,6 +318,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPatientRole(PatientRole newPatientRole) {

 		if (newPatientRole != patientRole) {

 			NotificationChain msgs = null;

@@ -353,6 +356,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -373,6 +377,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -391,6 +396,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -410,6 +416,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -430,6 +437,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -448,6 +456,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -457,6 +466,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ContextControl getContextControlCode() {

 		return contextControlCode;

 	}

@@ -466,6 +476,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextControlCode(ContextControl newContextControlCode) {

 		ContextControl oldContextControlCode = contextControlCode;

 		contextControlCode = newContextControlCode == null

@@ -486,6 +497,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextControlCode() {

 		ContextControl oldContextControlCode = contextControlCode;

 		boolean oldContextControlCodeESet = contextControlCodeESet;

@@ -504,6 +516,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextControlCode() {

 		return contextControlCodeESet;

 	}

@@ -678,7 +691,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ReferenceImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ReferenceImpl.java
index e94856d..8996642 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ReferenceImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ReferenceImpl.java
@@ -265,6 +265,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -303,6 +304,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public BL getSeperatableInd() {

 		return seperatableInd;

 	}

@@ -332,6 +334,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSeperatableInd(BL newSeperatableInd) {

 		if (newSeperatableInd != seperatableInd) {

 			NotificationChain msgs = null;

@@ -360,6 +363,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ExternalAct getExternalAct() {

 		return externalAct;

 	}

@@ -389,6 +393,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setExternalAct(ExternalAct newExternalAct) {

 		if (newExternalAct != externalAct) {

 			NotificationChain msgs = null;

@@ -416,6 +421,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ExternalObservation getExternalObservation() {

 		return externalObservation;

 	}

@@ -447,6 +453,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setExternalObservation(ExternalObservation newExternalObservation) {

 		if (newExternalObservation != externalObservation) {

 			NotificationChain msgs = null;

@@ -475,6 +482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ExternalProcedure getExternalProcedure() {

 		return externalProcedure;

 	}

@@ -505,6 +513,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setExternalProcedure(ExternalProcedure newExternalProcedure) {

 		if (newExternalProcedure != externalProcedure) {

 			NotificationChain msgs = null;

@@ -533,6 +542,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ExternalDocument getExternalDocument() {

 		return externalDocument;

 	}

@@ -563,6 +573,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setExternalDocument(ExternalDocument newExternalDocument) {

 		if (newExternalDocument != externalDocument) {

 			NotificationChain msgs = null;

@@ -601,6 +612,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -621,6 +633,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -639,6 +652,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -658,6 +672,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(x_ActRelationshipExternalReference newTypeCode) {

 		x_ActRelationshipExternalReference oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -677,6 +692,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		x_ActRelationshipExternalReference oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -695,6 +711,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -898,7 +915,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ReferenceRangeImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ReferenceRangeImpl.java
index 5c492b4..cb0f43b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ReferenceRangeImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ReferenceRangeImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -257,6 +258,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ObservationRange getObservationRange() {

 		return observationRange;

 	}

@@ -287,6 +289,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setObservationRange(ObservationRange newObservationRange) {

 		if (newObservationRange != observationRange) {

 			NotificationChain msgs = null;

@@ -325,6 +328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -345,6 +349,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -363,6 +368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -382,6 +388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ActRelationshipType newTypeCode) {

 		ActRelationshipType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -402,6 +409,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ActRelationshipType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -420,6 +428,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -575,7 +584,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RegionOfInterestImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RegionOfInterestImpl.java
index 13ee928..c85a04a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RegionOfInterestImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RegionOfInterestImpl.java
@@ -398,6 +398,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -438,6 +439,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.REGION_OF_INTEREST__ID);

@@ -450,6 +452,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getCode() {

 		return code;

 	}

@@ -479,6 +482,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CS newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -505,6 +509,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<RegionOfInterestValue> getValues() {

 		if (values == null) {

 			values = new EObjectContainmentEList<RegionOfInterestValue>(

@@ -518,6 +523,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -547,6 +553,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -574,6 +581,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(

@@ -587,6 +595,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(

@@ -600,6 +609,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.REGION_OF_INTEREST__AUTHOR);

@@ -612,6 +622,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -625,6 +636,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -638,6 +650,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EntryRelationship> getEntryRelationships() {

 		if (entryRelationships == null) {

 			entryRelationships = new EObjectContainmentEList<EntryRelationship>(

@@ -651,6 +664,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(

@@ -664,6 +678,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -677,6 +692,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public String getRegionOfInterestId() {

 		return regionOfInterestId;

 	}

@@ -686,6 +702,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRegionOfInterestId(String newRegionOfInterestId) {

 		String oldRegionOfInterestId = regionOfInterestId;

 		regionOfInterestId = newRegionOfInterestId;

@@ -712,6 +729,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -732,6 +750,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -750,6 +769,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -769,6 +789,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -789,6 +810,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -807,6 +829,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -826,6 +849,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -846,6 +870,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -864,6 +889,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1192,7 +1218,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (regionOfInterestId: ");

 		result.append(regionOfInterestId);

 		result.append(", nullFlavor: ");

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RegionOfInterestValueImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RegionOfInterestValueImpl.java
index 064e392..5d36c6a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RegionOfInterestValueImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RegionOfInterestValueImpl.java
@@ -75,6 +75,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isUnsorted() {

 		return unsorted;

 	}

@@ -84,6 +85,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setUnsorted(boolean newUnsorted) {

 		boolean oldUnsorted = unsorted;

 		unsorted = newUnsorted;

@@ -163,7 +165,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (unsorted: ");

 		result.append(unsorted);

 		result.append(')');

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedDocumentImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedDocumentImpl.java
index bf71844..153f5d7 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedDocumentImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedDocumentImpl.java
@@ -214,6 +214,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -254,6 +255,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ParentDocument getParentDocument() {

 		return parentDocument;

 	}

@@ -284,6 +286,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setParentDocument(ParentDocument newParentDocument) {

 		if (newParentDocument != parentDocument) {

 			NotificationChain msgs = null;

@@ -322,6 +325,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -342,6 +346,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -360,6 +365,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -379,6 +385,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(x_ActRelationshipDocument newTypeCode) {

 		x_ActRelationshipDocument oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -399,6 +406,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		x_ActRelationshipDocument oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -417,6 +425,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -563,7 +572,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedEntityImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedEntityImpl.java
index 7dc5d15..f748f05 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedEntityImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedEntityImpl.java
@@ -274,6 +274,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -314,6 +315,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -343,6 +345,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -368,6 +371,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.RELATED_ENTITY__ADDR);

@@ -380,6 +384,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.RELATED_ENTITY__TELECOM);

@@ -392,6 +397,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -421,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -449,6 +456,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SDTCPatient getSDTCPatient() {

 		return sDTCPatient;

 	}

@@ -478,6 +486,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCPatient(SDTCPatient newSDTCPatient) {

 		if (newSDTCPatient != sDTCPatient) {

 			NotificationChain msgs = null;

@@ -505,6 +514,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Person getRelatedPerson() {

 		return relatedPerson;

 	}

@@ -534,6 +544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRelatedPerson(Person newRelatedPerson) {

 		if (newRelatedPerson != relatedPerson) {

 			NotificationChain msgs = null;

@@ -572,6 +583,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -592,6 +604,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -610,6 +623,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -629,6 +643,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassMutualRelationship newClassCode) {

 		RoleClassMutualRelationship oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -649,6 +664,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassMutualRelationship oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -667,6 +683,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -875,7 +892,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedSubjectImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedSubjectImpl.java
index 4f76f04..f8afe43 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedSubjectImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/RelatedSubjectImpl.java
@@ -261,6 +261,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -301,6 +302,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public II getId() {

 		return id;

 	}

@@ -330,6 +332,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setId(II newId) {

 		if (newId != id) {

 			NotificationChain msgs = null;

@@ -355,6 +358,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -384,6 +388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -409,6 +414,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<AD> getAddrs() {

 		if (addrs == null) {

 			addrs = new EObjectContainmentEList<AD>(AD.class, this, CDAPackage.RELATED_SUBJECT__ADDR);

@@ -421,6 +427,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<TEL> getTelecoms() {

 		if (telecoms == null) {

 			telecoms = new EObjectContainmentEList<TEL>(TEL.class, this, CDAPackage.RELATED_SUBJECT__TELECOM);

@@ -433,6 +440,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SubjectPerson getSubject() {

 		return subject;

 	}

@@ -462,6 +470,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(SubjectPerson newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -499,6 +508,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -519,6 +529,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -537,6 +548,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -556,6 +568,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(x_DocumentSubject newClassCode) {

 		x_DocumentSubject oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -576,6 +589,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		x_DocumentSubject oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -594,6 +608,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -790,7 +805,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ResponsiblePartyImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ResponsiblePartyImpl.java
index 113c3e9..cd2101b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ResponsiblePartyImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ResponsiblePartyImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -257,6 +258,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public AssignedEntity getAssignedEntity() {

 		return assignedEntity;

 	}

@@ -287,6 +289,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAssignedEntity(AssignedEntity newAssignedEntity) {

 		if (newAssignedEntity != assignedEntity) {

 			NotificationChain msgs = null;

@@ -325,6 +328,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -345,6 +349,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -363,6 +368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -382,6 +388,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -402,6 +409,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -420,6 +428,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -575,7 +584,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SDTCPatientImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SDTCPatientImpl.java
index 6a7a99b..bbbb7c1 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SDTCPatientImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SDTCPatientImpl.java
@@ -68,6 +68,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public II getId() {

 		return id;

 	}

@@ -97,6 +98,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setId(II newId) {

 		if (newId != id) {

 			NotificationChain msgs = null;

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SectionImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SectionImpl.java
index bb23f48..3d7a83a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SectionImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SectionImpl.java
@@ -407,6 +407,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -445,6 +446,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public II getId() {

 		return id;

 	}

@@ -474,6 +476,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setId(II newId) {

 		if (newId != id) {

 			NotificationChain msgs = null;

@@ -499,6 +502,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -528,6 +532,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -553,6 +558,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ST getTitle() {

 		return title;

 	}

@@ -582,6 +588,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTitle(ST newTitle) {

 		if (newTitle != title) {

 			NotificationChain msgs = null;

@@ -607,6 +614,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public StrucDocText getText() {

 		return text;

 	}

@@ -636,6 +644,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(StrucDocText newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -661,6 +670,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getConfidentialityCode() {

 		return confidentialityCode;

 	}

@@ -691,6 +701,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setConfidentialityCode(CE newConfidentialityCode) {

 		if (newConfidentialityCode != confidentialityCode) {

 			NotificationChain msgs = null;

@@ -719,6 +730,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -748,6 +760,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -775,6 +788,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -804,6 +818,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -829,6 +844,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.SECTION__AUTHOR);

@@ -841,6 +857,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -854,6 +871,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Entry> getEntries() {

 		if (entries == null) {

 			entries = new EObjectContainmentEList<Entry>(Entry.class, this, CDAPackage.SECTION__ENTRY);

@@ -866,6 +884,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Component5> getComponents() {

 		if (components == null) {

 			components = new EObjectContainmentEList<Component5>(Component5.class, this, CDAPackage.SECTION__COMPONENT);

@@ -878,6 +897,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public String getSectionId() {

 		return sectionId;

 	}

@@ -887,6 +907,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSectionId(String newSectionId) {

 		String oldSectionId = sectionId;

 		sectionId = newSectionId;

@@ -905,6 +926,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetSectionId() {

 		String oldSectionId = sectionId;

 		boolean oldSectionIdESet = sectionIdESet;

@@ -923,6 +945,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetSectionId() {

 		return sectionIdESet;

 	}

@@ -942,6 +965,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -962,6 +986,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -980,6 +1005,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -999,6 +1025,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1019,6 +1046,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1037,6 +1065,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1056,6 +1085,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -1075,6 +1105,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -1093,6 +1124,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1734,7 +1766,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (sectionId: ");

 		if (sectionIdESet) {

 			result.append(sectionId);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ServiceEventImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ServiceEventImpl.java
index 728a1e5..851ff99 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ServiceEventImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/ServiceEventImpl.java
@@ -283,6 +283,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -322,6 +323,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.SERVICE_EVENT__ID);

@@ -334,6 +336,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getCode() {

 		return code;

 	}

@@ -363,6 +366,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CE newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -388,6 +392,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getEffectiveTime() {

 		return effectiveTime;

 	}

@@ -417,6 +422,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setEffectiveTime(IVL_TS newEffectiveTime) {

 		if (newEffectiveTime != effectiveTime) {

 			NotificationChain msgs = null;

@@ -445,6 +451,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer1> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer1>(

@@ -468,6 +475,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -488,6 +496,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -506,6 +515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -525,6 +535,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassRoot newClassCode) {

 		ActClassRoot oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -545,6 +556,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassRoot oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -563,6 +575,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -582,6 +595,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -602,6 +616,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -620,6 +635,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -823,7 +839,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SpecimenImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SpecimenImpl.java
index 15f5cd9..f64a9d1 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SpecimenImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SpecimenImpl.java
@@ -217,6 +217,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -255,6 +256,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public SpecimenRole getSpecimenRole() {

 		return specimenRole;

 	}

@@ -284,6 +286,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSpecimenRole(SpecimenRole newSpecimenRole) {

 		if (newSpecimenRole != specimenRole) {

 			NotificationChain msgs = null;

@@ -321,6 +324,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -341,6 +345,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -359,6 +364,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -378,6 +384,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationType newTypeCode) {

 		ParticipationType oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -397,6 +404,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationType oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -415,6 +423,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -570,7 +579,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SpecimenRoleImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SpecimenRoleImpl.java
index d5a28b6..4f6853d 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SpecimenRoleImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SpecimenRoleImpl.java
@@ -228,6 +228,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -267,6 +268,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.SPECIMEN_ROLE__ID);

@@ -279,6 +281,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public PlayingEntity getSpecimenPlayingEntity() {

 		return specimenPlayingEntity;

 	}

@@ -310,6 +313,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSpecimenPlayingEntity(PlayingEntity newSpecimenPlayingEntity) {

 		if (newSpecimenPlayingEntity != specimenPlayingEntity) {

 			NotificationChain msgs = null;

@@ -348,6 +352,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -368,6 +373,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -386,6 +392,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -405,6 +412,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(RoleClassSpecimen newClassCode) {

 		RoleClassSpecimen oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -425,6 +433,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		RoleClassSpecimen oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -443,6 +452,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -611,7 +621,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/StrucDocTextImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/StrucDocTextImpl.java
index ac951e6..75689a6 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/StrucDocTextImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/StrucDocTextImpl.java
@@ -98,6 +98,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public FeatureMap getMixed() {

 		if (mixed == null) {

 			mixed = new BasicFeatureMap(this, CDAPackage.STRUC_DOC_TEXT__MIXED);

@@ -110,6 +111,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public FeatureMap getAny() {

 		return (FeatureMap) getMixed().<FeatureMap.Entry> list(CDAPackage.Literals.STRUC_DOC_TEXT__ANY);

 	}

@@ -119,6 +121,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public String getID() {

 		return iD;

 	}

@@ -128,6 +131,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setID(String newID) {

 		String oldID = iD;

 		iD = newID;

@@ -316,7 +320,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (mixed: ");

 		result.append(mixed);

 		result.append(", iD: ");

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/StructuredBodyImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/StructuredBodyImpl.java
index c7b2d78..c9c0496 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/StructuredBodyImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/StructuredBodyImpl.java
@@ -271,6 +271,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -311,6 +312,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getConfidentialityCode() {

 		return confidentialityCode;

 	}

@@ -341,6 +343,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setConfidentialityCode(CE newConfidentialityCode) {

 		if (newConfidentialityCode != confidentialityCode) {

 			NotificationChain msgs = null;

@@ -369,6 +372,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getLanguageCode() {

 		return languageCode;

 	}

@@ -398,6 +402,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setLanguageCode(CS newLanguageCode) {

 		if (newLanguageCode != languageCode) {

 			NotificationChain msgs = null;

@@ -426,6 +431,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Component3> getComponents() {

 		if (components == null) {

 			components = new EObjectContainmentEList<Component3>(

@@ -449,6 +455,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -469,6 +476,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -487,6 +495,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -506,6 +515,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -526,6 +536,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -544,6 +555,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -563,6 +575,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(ActMood newMoodCode) {

 		ActMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -583,6 +596,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		ActMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -601,6 +615,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -800,7 +815,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubjectImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubjectImpl.java
index 17ce3a6..e86cf75 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubjectImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubjectImpl.java
@@ -260,6 +260,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -298,6 +299,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getAwarenessCode() {

 		return awarenessCode;

 	}

@@ -327,6 +329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAwarenessCode(CE newAwarenessCode) {

 		if (newAwarenessCode != awarenessCode) {

 			NotificationChain msgs = null;

@@ -354,6 +357,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RelatedSubject getRelatedSubject() {

 		return relatedSubject;

 	}

@@ -383,6 +387,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRelatedSubject(RelatedSubject newRelatedSubject) {

 		if (newRelatedSubject != relatedSubject) {

 			NotificationChain msgs = null;

@@ -420,6 +425,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -440,6 +446,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -458,6 +465,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -477,6 +485,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeCode(ParticipationTargetSubject newTypeCode) {

 		ParticipationTargetSubject oldTypeCode = typeCode;

 		typeCode = newTypeCode == null

@@ -496,6 +505,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetTypeCode() {

 		ParticipationTargetSubject oldTypeCode = typeCode;

 		boolean oldTypeCodeESet = typeCodeESet;

@@ -514,6 +524,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetTypeCode() {

 		return typeCodeESet;

 	}

@@ -523,6 +534,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ContextControl getContextControlCode() {

 		return contextControlCode;

 	}

@@ -532,6 +544,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setContextControlCode(ContextControl newContextControlCode) {

 		ContextControl oldContextControlCode = contextControlCode;

 		contextControlCode = newContextControlCode == null

@@ -552,6 +565,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetContextControlCode() {

 		ContextControl oldContextControlCode = contextControlCode;

 		boolean oldContextControlCodeESet = contextControlCodeESet;

@@ -570,6 +584,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetContextControlCode() {

 		return contextControlCodeESet;

 	}

@@ -756,7 +771,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubjectPersonImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubjectPersonImpl.java
index 7fe932b..c6a5d7e 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubjectPersonImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubjectPersonImpl.java
@@ -363,6 +363,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -403,6 +404,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getSDTCIds() {

 		if (sDTCIds == null) {

 			sDTCIds = new EObjectContainmentEList<II>(II.class, this, CDAPackage.SUBJECT_PERSON__SDTC_ID);

@@ -415,6 +417,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<PN> getNames() {

 		if (names == null) {

 			names = new EObjectContainmentEList<PN>(PN.class, this, CDAPackage.SUBJECT_PERSON__NAME);

@@ -427,6 +430,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getSDTCDesc() {

 		return sDTCDesc;

 	}

@@ -456,6 +460,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCDesc(ED newSDTCDesc) {

 		if (newSDTCDesc != sDTCDesc) {

 			NotificationChain msgs = null;

@@ -483,6 +488,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getAdministrativeGenderCode() {

 		return administrativeGenderCode;

 	}

@@ -513,6 +519,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAdministrativeGenderCode(CE newAdministrativeGenderCode) {

 		if (newAdministrativeGenderCode != administrativeGenderCode) {

 			NotificationChain msgs = null;

@@ -541,6 +548,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getBirthTime() {

 		return birthTime;

 	}

@@ -570,6 +578,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setBirthTime(TS newBirthTime) {

 		if (newBirthTime != birthTime) {

 			NotificationChain msgs = null;

@@ -597,6 +606,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public BL getSDTCDeceasedInd() {

 		return sDTCDeceasedInd;

 	}

@@ -627,6 +637,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCDeceasedInd(BL newSDTCDeceasedInd) {

 		if (newSDTCDeceasedInd != sDTCDeceasedInd) {

 			NotificationChain msgs = null;

@@ -655,6 +666,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public TS getSDTCDeceasedTime() {

 		return sDTCDeceasedTime;

 	}

@@ -685,6 +697,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCDeceasedTime(TS newSDTCDeceasedTime) {

 		if (newSDTCDeceasedTime != sDTCDeceasedTime) {

 			NotificationChain msgs = null;

@@ -713,6 +726,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public BL getSDTCMultipleBirthInd() {

 		return sDTCMultipleBirthInd;

 	}

@@ -743,6 +757,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCMultipleBirthInd(BL newSDTCMultipleBirthInd) {

 		if (newSDTCMultipleBirthInd != sDTCMultipleBirthInd) {

 			NotificationChain msgs = null;

@@ -771,6 +786,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public INT getSDTCMultipleBirthOrderNumber() {

 		return sDTCMultipleBirthOrderNumber;

 	}

@@ -802,6 +818,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSDTCMultipleBirthOrderNumber(INT newSDTCMultipleBirthOrderNumber) {

 		if (newSDTCMultipleBirthOrderNumber != sDTCMultipleBirthOrderNumber) {

 			NotificationChain msgs = null;

@@ -832,6 +849,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getSDTCRaceCodes() {

 		if (sDTCRaceCodes == null) {

 			sDTCRaceCodes = new EObjectContainmentEList<CE>(CE.class, this, CDAPackage.SUBJECT_PERSON__SDTC_RACE_CODE);

@@ -854,6 +872,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -874,6 +893,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -892,6 +912,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -911,6 +932,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(EntityClass newClassCode) {

 		EntityClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -931,6 +953,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		EntityClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -949,6 +972,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -968,6 +992,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDeterminerCode(EntityDeterminer newDeterminerCode) {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		determinerCode = newDeterminerCode == null

@@ -988,6 +1013,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetDeterminerCode() {

 		EntityDeterminer oldDeterminerCode = determinerCode;

 		boolean oldDeterminerCodeESet = determinerCodeESet;

@@ -1006,6 +1032,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetDeterminerCode() {

 		return determinerCodeESet;

 	}

@@ -1015,6 +1042,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getSDTCEthnicGroupCodes() {

 		if (sDTCEthnicGroupCodes == null) {

 			sDTCEthnicGroupCodes = new EObjectContainmentEList<CE>(

@@ -1317,7 +1345,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubstanceAdministrationImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubstanceAdministrationImpl.java
index 2081357..a3b6028 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubstanceAdministrationImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SubstanceAdministrationImpl.java
@@ -548,6 +548,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -589,6 +590,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.SUBSTANCE_ADMINISTRATION__ID);

@@ -601,6 +603,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -630,6 +633,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -657,6 +661,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -686,6 +691,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -713,6 +719,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -742,6 +749,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -770,6 +778,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<SXCM_TS> getEffectiveTimes() {

 		if (effectiveTimes == null) {

 			effectiveTimes = new EObjectContainmentEList<SXCM_TS>(

@@ -783,6 +792,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getPriorityCode() {

 		return priorityCode;

 	}

@@ -813,6 +823,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setPriorityCode(CE newPriorityCode) {

 		if (newPriorityCode != priorityCode) {

 			NotificationChain msgs = null;

@@ -841,6 +852,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_INT getRepeatNumber() {

 		return repeatNumber;

 	}

@@ -871,6 +883,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRepeatNumber(IVL_INT newRepeatNumber) {

 		if (newRepeatNumber != repeatNumber) {

 			NotificationChain msgs = null;

@@ -899,6 +912,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getRouteCode() {

 		return routeCode;

 	}

@@ -928,6 +942,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRouteCode(CE newRouteCode) {

 		if (newRouteCode != routeCode) {

 			NotificationChain msgs = null;

@@ -956,6 +971,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CD> getApproachSiteCodes() {

 		if (approachSiteCodes == null) {

 			approachSiteCodes = new EObjectContainmentEList<CD>(

@@ -969,6 +985,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_PQ getDoseQuantity() {

 		return doseQuantity;

 	}

@@ -999,6 +1016,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setDoseQuantity(IVL_PQ newDoseQuantity) {

 		if (newDoseQuantity != doseQuantity) {

 			NotificationChain msgs = null;

@@ -1027,6 +1045,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_PQ getRateQuantity() {

 		return rateQuantity;

 	}

@@ -1057,6 +1076,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRateQuantity(IVL_PQ newRateQuantity) {

 		if (newRateQuantity != rateQuantity) {

 			NotificationChain msgs = null;

@@ -1085,6 +1105,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public RTO_PQ_PQ getMaxDoseQuantity() {

 		return maxDoseQuantity;

 	}

@@ -1115,6 +1136,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMaxDoseQuantity(RTO_PQ_PQ newMaxDoseQuantity) {

 		if (newMaxDoseQuantity != maxDoseQuantity) {

 			NotificationChain msgs = null;

@@ -1143,6 +1165,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CE getAdministrationUnitCode() {

 		return administrationUnitCode;

 	}

@@ -1173,6 +1196,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setAdministrationUnitCode(CE newAdministrationUnitCode) {

 		if (newAdministrationUnitCode != administrationUnitCode) {

 			NotificationChain msgs = null;

@@ -1203,6 +1227,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -1232,6 +1257,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -1259,6 +1285,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(

@@ -1272,6 +1299,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Consumable getConsumable() {

 		return consumable;

 	}

@@ -1301,6 +1329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setConsumable(Consumable newConsumable) {

 		if (newConsumable != consumable) {

 			NotificationChain msgs = null;

@@ -1329,6 +1358,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(

@@ -1342,6 +1372,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(

@@ -1355,6 +1386,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -1368,6 +1400,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(

@@ -1381,6 +1414,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -1394,6 +1428,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EntryRelationship> getEntryRelationships() {

 		if (entryRelationships == null) {

 			entryRelationships = new EObjectContainmentEList<EntryRelationship>(

@@ -1407,6 +1442,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -1420,6 +1456,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<InFulfillmentOf1> getInFulfillmentOf1s() {

 		if (inFulfillmentOf1s == null) {

 			inFulfillmentOf1s = new EObjectContainmentEList<InFulfillmentOf1>(

@@ -1443,6 +1480,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -1463,6 +1501,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -1481,6 +1520,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1500,6 +1540,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClass newClassCode) {

 		ActClass oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1520,6 +1561,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClass oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1538,6 +1580,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1557,6 +1600,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(x_DocumentSubstanceMood newMoodCode) {

 		x_DocumentSubstanceMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -1577,6 +1621,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		x_DocumentSubstanceMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -1595,6 +1640,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1614,6 +1660,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNegationInd(Boolean newNegationInd) {

 		Boolean oldNegationInd = negationInd;

 		negationInd = newNegationInd;

@@ -1632,6 +1679,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNegationInd() {

 		Boolean oldNegationInd = negationInd;

 		boolean oldNegationIndESet = negationIndESet;

@@ -1650,6 +1698,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNegationInd() {

 		return negationIndESet;

 	}

@@ -2113,7 +2162,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SupplyImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SupplyImpl.java
index 82978d6..132e940 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SupplyImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/SupplyImpl.java
@@ -485,6 +485,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setTypeId(InfrastructureRootTypeId newTypeId) {

 		if (newTypeId != typeId) {

 			NotificationChain msgs = null;

@@ -523,6 +524,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<II> getIds() {

 		if (ids == null) {

 			ids = new EObjectContainmentEList<II>(II.class, this, CDAPackage.SUPPLY__ID);

@@ -535,6 +537,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CD getCode() {

 		return code;

 	}

@@ -564,6 +567,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setCode(CD newCode) {

 		if (newCode != code) {

 			NotificationChain msgs = null;

@@ -589,6 +593,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public ED getText() {

 		return text;

 	}

@@ -618,6 +623,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setText(ED newText) {

 		if (newText != text) {

 			NotificationChain msgs = null;

@@ -643,6 +649,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public CS getStatusCode() {

 		return statusCode;

 	}

@@ -672,6 +679,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setStatusCode(CS newStatusCode) {

 		if (newStatusCode != statusCode) {

 			NotificationChain msgs = null;

@@ -699,6 +707,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<SXCM_TS> getEffectiveTimes() {

 		if (effectiveTimes == null) {

 			effectiveTimes = new EObjectContainmentEList<SXCM_TS>(

@@ -712,6 +721,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<CE> getPriorityCodes() {

 		if (priorityCodes == null) {

 			priorityCodes = new EObjectContainmentEList<CE>(CE.class, this, CDAPackage.SUPPLY__PRIORITY_CODE);

@@ -724,6 +734,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_INT getRepeatNumber() {

 		return repeatNumber;

 	}

@@ -753,6 +764,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setRepeatNumber(IVL_INT newRepeatNumber) {

 		if (newRepeatNumber != repeatNumber) {

 			NotificationChain msgs = null;

@@ -780,6 +792,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public BL getIndependentInd() {

 		return independentInd;

 	}

@@ -809,6 +822,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setIndependentInd(BL newIndependentInd) {

 		if (newIndependentInd != independentInd) {

 			NotificationChain msgs = null;

@@ -836,6 +850,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public PQ getQuantity() {

 		return quantity;

 	}

@@ -865,6 +880,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setQuantity(PQ newQuantity) {

 		if (newQuantity != quantity) {

 			NotificationChain msgs = null;

@@ -891,6 +907,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public IVL_TS getExpectedUseTime() {

 		return expectedUseTime;

 	}

@@ -920,6 +937,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setExpectedUseTime(IVL_TS newExpectedUseTime) {

 		if (newExpectedUseTime != expectedUseTime) {

 			NotificationChain msgs = null;

@@ -948,6 +966,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Subject getSubject() {

 		return subject;

 	}

@@ -977,6 +996,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setSubject(Subject newSubject) {

 		if (newSubject != subject) {

 			NotificationChain msgs = null;

@@ -1002,6 +1022,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Specimen> getSpecimens() {

 		if (specimens == null) {

 			specimens = new EObjectContainmentEList<Specimen>(Specimen.class, this, CDAPackage.SUPPLY__SPECIMEN);

@@ -1014,6 +1035,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public Product getProduct() {

 		return product;

 	}

@@ -1043,6 +1065,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setProduct(Product newProduct) {

 		if (newProduct != product) {

 			NotificationChain msgs = null;

@@ -1068,6 +1091,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Performer2> getPerformers() {

 		if (performers == null) {

 			performers = new EObjectContainmentEList<Performer2>(Performer2.class, this, CDAPackage.SUPPLY__PERFORMER);

@@ -1080,6 +1104,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Author> getAuthors() {

 		if (authors == null) {

 			authors = new EObjectContainmentEList<Author>(Author.class, this, CDAPackage.SUPPLY__AUTHOR);

@@ -1092,6 +1117,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Informant12> getInformants() {

 		if (informants == null) {

 			informants = new EObjectContainmentEList<Informant12>(

@@ -1105,6 +1131,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Participant2> getParticipants() {

 		if (participants == null) {

 			participants = new EObjectContainmentEList<Participant2>(

@@ -1118,6 +1145,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<EntryRelationship> getEntryRelationships() {

 		if (entryRelationships == null) {

 			entryRelationships = new EObjectContainmentEList<EntryRelationship>(

@@ -1131,6 +1159,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Reference> getReferences() {

 		if (references == null) {

 			references = new EObjectContainmentEList<Reference>(Reference.class, this, CDAPackage.SUPPLY__REFERENCE);

@@ -1143,6 +1172,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<Precondition> getPreconditions() {

 		if (preconditions == null) {

 			preconditions = new EObjectContainmentEList<Precondition>(

@@ -1156,6 +1186,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public EList<InFulfillmentOf1> getInFulfillmentOf1s() {

 		if (inFulfillmentOf1s == null) {

 			inFulfillmentOf1s = new EObjectContainmentEList<InFulfillmentOf1>(

@@ -1179,6 +1210,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setNullFlavor(NullFlavor newNullFlavor) {

 		NullFlavor oldNullFlavor = nullFlavor;

 		nullFlavor = newNullFlavor == null

@@ -1199,6 +1231,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetNullFlavor() {

 		NullFlavor oldNullFlavor = nullFlavor;

 		boolean oldNullFlavorESet = nullFlavorESet;

@@ -1217,6 +1250,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetNullFlavor() {

 		return nullFlavorESet;

 	}

@@ -1236,6 +1270,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setClassCode(ActClassSupply newClassCode) {

 		ActClassSupply oldClassCode = classCode;

 		classCode = newClassCode == null

@@ -1255,6 +1290,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetClassCode() {

 		ActClassSupply oldClassCode = classCode;

 		boolean oldClassCodeESet = classCodeESet;

@@ -1273,6 +1309,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetClassCode() {

 		return classCodeESet;

 	}

@@ -1292,6 +1329,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void setMoodCode(x_DocumentSubstanceMood newMoodCode) {

 		x_DocumentSubstanceMood oldMoodCode = moodCode;

 		moodCode = newMoodCode == null

@@ -1311,6 +1349,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public void unsetMoodCode() {

 		x_DocumentSubstanceMood oldMoodCode = moodCode;

 		boolean oldMoodCodeESet = moodCodeESet;

@@ -1329,6 +1368,7 @@
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@Override

 	public boolean isSetMoodCode() {

 		return moodCodeESet;

 	}

@@ -1746,7 +1786,7 @@
 			return super.toString();

 		}

 

-		StringBuffer result = new StringBuffer(super.toString());

+		StringBuilder result = new StringBuilder(super.toString());

 		result.append(" (nullFlavor: ");

 		if (nullFlavorESet) {

 			result.append(nullFlavor);

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/cda.ecore b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/cda.ecore
index edd4b7f..53b5825 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/cda.ecore
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/impl/cda.ecore
@@ -4964,6 +4964,15 @@
         <details key="kind" value="element"/>

       </eAnnotations>

     </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="sDTCFunctionCode" ordered="false"

+        eType="ecore:EClass http://www.openhealthtools.org/mdht/uml/hl7/datatypes#//CE"

+        containment="true">

+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

+        <details key="name" value="functionCode"/>

+        <details key="namespace" value="urn:hl7-org:sdtc"/>

+        <details key="kind" value="element"/>

+      </eAnnotations>

+    </eStructuralFeatures>

     <eStructuralFeatures xsi:type="ecore:EReference" name="time" ordered="false" eType="ecore:EClass http://www.openhealthtools.org/mdht/uml/hl7/datatypes#//IVL_TS"

         containment="true">

       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

@@ -4992,15 +5001,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeCode" ordered="false"

         eType="ecore:EEnum http://www.openhealthtools.org/mdht/uml/hl7/vocab#//ParticipationPhysicalPerformer"

         defaultValueLiteral="PRF" unsettable="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="sDTCFunctionCode" ordered="false"

-        eType="ecore:EClass http://www.openhealthtools.org/mdht/uml/hl7/datatypes#//CE"

-        containment="true">

-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

-        <details key="name" value="functionCode"/>

-        <details key="namespace" value="urn:hl7-org:sdtc"/>

-        <details key="kind" value="element"/>

-      </eAnnotations>

-    </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Participant2" eSuperTypes="http://www.openhealthtools.org/mdht/uml/hl7/rim#//Participation">

     <eOperations name="contextControlCode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/internal/resource/CDAResourceFactoryImpl.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/internal/resource/CDAResourceFactoryImpl.java
index 0cf3d22..ec12215 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/internal/resource/CDAResourceFactoryImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/internal/resource/CDAResourceFactoryImpl.java
@@ -77,8 +77,8 @@
 		// this complements the DataTypeElementHandler that converts datatype xsi:type information on load

 		result.getDefaultSaveOptions().put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, new XMLSave.XMLTypeInfo() {

 			public boolean shouldSaveType(EClass objectType, EClassifier featureType, EStructuralFeature feature) {

-				return objectType != featureType

-						&& objectType.getEPackage().getNsURI().equals(DatatypesPackage.eNS_URI);

+				return objectType != featureType &&

+						objectType.getEPackage().getNsURI().equals(DatatypesPackage.eNS_URI);

 			}

 

 			public boolean shouldSaveType(EClass objectType, EClass featureType, EStructuralFeature feature) {

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/ClinicalStatementOperations.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/ClinicalStatementOperations.java
index 3325a66..b946e9b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/ClinicalStatementOperations.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/ClinicalStatementOperations.java
@@ -483,8 +483,8 @@
 		if (cd == null || code == null || codeSystem == null || codeSystemName == null) {

 			return false;

 		}

-		return code.equals(cd.getCode()) && codeSystem.equals(cd.getCodeSystem())

-				&& codeSystemName.equals(cd.getCodeSystemName());

+		return code.equals(cd.getCode()) && codeSystem.equals(cd.getCodeSystem()) &&

+				codeSystemName.equals(cd.getCodeSystemName());

 	}

 

 	/**

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/StrucDocTextOperations.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/StrucDocTextOperations.java
index c97807d..2c16420 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/StrucDocTextOperations.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/operations/StrucDocTextOperations.java
@@ -148,8 +148,8 @@
 			} else if (feature instanceof EReference) {

 

 				buffer.append(

-					"<" + feature.getName() + ">" + getText(((AnyType) featureMap.getValue(i)).getMixed()) + "</"

-							+ feature.getName() + ">");

+					"<" + feature.getName() + ">" + getText(((AnyType) featureMap.getValue(i)).getMixed()) + "</" +

+							feature.getName() + ">");

 			}

 		}

 

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/TestSTDC.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/TestSTDC.java
index d40a872..ffd1e28 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/TestSTDC.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/tests/TestSTDC.java
@@ -25,6 +25,7 @@
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
 import org.eclipse.mdht.uml.cda.CDAFactory;
 import org.eclipse.mdht.uml.cda.Patient;
+import org.eclipse.mdht.uml.cda.Performer2;
 import org.eclipse.mdht.uml.cda.SubjectPerson;
 import org.eclipse.mdht.uml.cda.util.CDAUtil;
 import org.eclipse.mdht.uml.hl7.datatypes.DatatypesFactory;
@@ -150,6 +151,11 @@
 		SubjectPerson sp = CDAFactory.eINSTANCE.createSubjectPerson();
 		populate(sp, 4);
 		CDAUtil.saveSnippet(sp, System.out);
+
+		System.out.println("asdfasdf");
+		Performer2 performer2 = CDAFactory.eINSTANCE.createPerformer2();
+		populate(performer2, 4);
+		CDAUtil.saveSnippet(performer2, System.out);
 		// sp.setAdministrativeGenderCode(DatatypesFactory.eINSTANCE);
 
 	}
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/AnnotationBasedInitializer.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/AnnotationBasedInitializer.java
index 1cb999c..10d0253 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/AnnotationBasedInitializer.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/AnnotationBasedInitializer.java
@@ -55,8 +55,8 @@
 
 	@Override
 	public boolean equals(Object obj) {
-		return (obj instanceof AnnotationBasedInitializer)
-				&& ((AnnotationBasedInitializer) obj).targetType.equals(targetType);
+		return (obj instanceof AnnotationBasedInitializer) &&
+				((AnnotationBasedInitializer) obj).targetType.equals(targetType);
 	}
 
 	@Override
diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/BasicValidationHandler.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/BasicValidationHandler.java
index 9bd9c12..2c81a0e 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/BasicValidationHandler.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/BasicValidationHandler.java
@@ -52,7 +52,8 @@
 	/*

 	 * (non-Javadoc)

 	 *

-	 * @see org.eclipse.mdht.uml.cda.util.CDAUtil.ValidationHandler#setValidationStatistics(org.eclipse.mdht.uml.cda.util.CDAUtil.ValidationStatistics)

+	 * @see

+	 * org.eclipse.mdht.uml.cda.util.CDAUtil.ValidationHandler#setValidationStatistics(org.eclipse.mdht.uml.cda.util.CDAUtil.ValidationStatistics)

 	 */

 	@Override

 	public void setValidationStatistics(ValidationStatistics validationStatistics) {

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/CDAUtil.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/CDAUtil.java
index 12de110..831fb1a 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/CDAUtil.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/CDAUtil.java
@@ -637,8 +637,8 @@
 		String snippetName = cdaSnippet.eClass().getName();

 

 		for (EClass eClass : cdaSnippet.eClass().getEAllSuperTypes()) {

-			if (CDAPackage.eINSTANCE.getNsURI().equals(eClass.getEPackage().getNsURI())

-					&& !"ClinicalStatement".equals(eClass.getName())) {

+			if (CDAPackage.eINSTANCE.getNsURI().equals(eClass.getEPackage().getNsURI()) &&

+					!"ClinicalStatement".equals(eClass.getName())) {

 				snippetName = eClass.getName();

 				break;

 			}

@@ -679,8 +679,8 @@
 			EObject eObject = queue.remove();

 			EClass eClass = eObject.eClass();

 			for (EAttribute attribute : eClass.getEAllAttributes()) { // visit

-				if (!eObject.eIsSet(attribute) && attribute.getLowerBound() > 0

-						&& attribute.getDefaultValueLiteral() != null) {

+				if (!eObject.eIsSet(attribute) && attribute.getLowerBound() > 0 &&

+						attribute.getDefaultValueLiteral() != null) {

 					if (attribute.isMany()) {

 						List<Object> list = (List<Object>) eObject.eGet(attribute);

 						list.add(attribute.getDefaultValue());

@@ -971,8 +971,8 @@
 					target = element;

 				}

 			}

-			if ((Boolean.FALSE == rel.getInversionInd() || null == rel.getInversionInd()) && typeCodeMatch

-					&& target != null && (targetClass == null || targetClass.isSuperTypeOf(target.eClass()))) {

+			if ((Boolean.FALSE == rel.getInversionInd() || null == rel.getInversionInd()) && typeCodeMatch &&

+					target != null && (targetClass == null || targetClass.isSuperTypeOf(target.eClass()))) {

 				targets.add(target);

 			}

 		}

@@ -983,8 +983,9 @@
 			boolean typeCodeMatch = typeCode == null

 					? true

 					: typeCode.equals(rel.getTypeCode());

-			if (Boolean.TRUE == rel.getInversionInd() && typeCodeMatch && rel.eContainer() instanceof ClinicalStatement

-					&& (targetClass == null || targetClass.isSuperTypeOf(rel.eContainer().eClass()))) {

+			if (Boolean.TRUE == rel.getInversionInd() && typeCodeMatch &&

+					rel.eContainer() instanceof ClinicalStatement &&

+					(targetClass == null || targetClass.isSuperTypeOf(rel.eContainer().eClass()))) {

 				targets.add((ClinicalStatement) rel.eContainer());

 			}

 		}

@@ -1019,8 +1020,8 @@
 					target = element;

 				}

 			}

-			if (typeCodeMatch && target != null

-					&& (targetClass == null || targetClass.isSuperTypeOf(target.eClass()))) {

+			if (typeCodeMatch && target != null &&

+					(targetClass == null || targetClass.isSuperTypeOf(target.eClass()))) {

 				targets.add(target);

 			}

 		}

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/ValidationResult.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/ValidationResult.java
index 3aba3a7..0b667e8 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/ValidationResult.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/util/ValidationResult.java
@@ -79,9 +79,9 @@
 	public List<Diagnostic> getEMFValidationDiagnostics() {

 		return getDiagnostics(new Filter<Diagnostic>() {

 			public boolean accept(Diagnostic item) {

-				return !SCHEMA_VALIDATION_DIAGNOSTIC_SOURCE.equals(item.getSource())

-						&& !EMF_COMMON_DIAGNOSTIC_SOURCE.equals(item.getSource())

-						&& !EMF_RESOURCE_DIAGNOSTIC_SOURCE.equals(item.getSource());

+				return !SCHEMA_VALIDATION_DIAGNOSTIC_SOURCE.equals(item.getSource()) &&

+						!EMF_COMMON_DIAGNOSTIC_SOURCE.equals(item.getSource()) &&

+						!EMF_RESOURCE_DIAGNOSTIC_SOURCE.equals(item.getSource());

 			}

 		});

 	}

@@ -90,8 +90,8 @@
 	public List<Diagnostic> getEMFResourceDiagnostics() {

 		return getDiagnostics(new Filter<Diagnostic>() {

 			public boolean accept(Diagnostic item) {

-				return EMF_COMMON_DIAGNOSTIC_SOURCE.equals(item.getSource())

-						|| EMF_RESOURCE_DIAGNOSTIC_SOURCE.equals(item.getSource());

+				return EMF_COMMON_DIAGNOSTIC_SOURCE.equals(item.getSource()) ||

+						EMF_RESOURCE_DIAGNOSTIC_SOURCE.equals(item.getSource());

 			}

 		});

 	}

diff --git a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/validate/Validate.java b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/validate/Validate.java
index 2ebedea..e3f6a16 100644
--- a/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/validate/Validate.java
+++ b/cda/plugins/org.eclipse.mdht.uml.cda/src/org/eclipse/mdht/uml/cda/validate/Validate.java
@@ -121,12 +121,12 @@
 						try {

 							if (eld != null) {

 								out.write(

-									"error" + DELIMITER + eld.line + DELIMITER + eld.column + DELIMITER

-											+ diagnostic.getMessage() + "\n");

+									"error" + DELIMITER + eld.line + DELIMITER + eld.column + DELIMITER +

+											diagnostic.getMessage() + "\n");

 							} else {

 								out.write(

-									"error" + DELIMITER + 0 + DELIMITER + 0 + DELIMITER + diagnostic.getMessage() + "("

-											+ path + ")" + "\n");

+									"error" + DELIMITER + 0 + DELIMITER + 0 + DELIMITER + diagnostic.getMessage() +

+											"(" + path + ")" + "\n");

 							}

 

 						} catch (IOException e) {

@@ -150,12 +150,12 @@
 						try {

 							if (eld != null) {

 								out.write(

-									"warning" + DELIMITER + eld.line + DELIMITER + eld.column + DELIMITER

-											+ diagnostic.getMessage() + "\n");

+									"warning" + DELIMITER + eld.line + DELIMITER + eld.column + DELIMITER +

+											diagnostic.getMessage() + "\n");

 							} else {

 								out.write(

-									"warning" + DELIMITER + 0 + DELIMITER + 0 + DELIMITER + diagnostic.getMessage()

-											+ "(" + path + ")" + "\n");

+									"warning" + DELIMITER + 0 + DELIMITER + 0 + DELIMITER + diagnostic.getMessage() +

+											"(" + path + ")" + "\n");

 							}

 						} catch (IOException e) {

 							e.printStackTrace();

@@ -190,12 +190,12 @@
 

 					if (eld != null) {

 						out.write(

-							"error" + DELIMITER + eld.line + DELIMITER + eld.column + DELIMITER

-									+ "CDA document load error : " + rootMessage + "\n");

+							"error" + DELIMITER + eld.line + DELIMITER + eld.column + DELIMITER +

+									"CDA document load error : " + rootMessage + "\n");

 					} else {

 						out.write(

-							"error" + DELIMITER + 1 + DELIMITER + 1 + DELIMITER + "CDA document load error : "

-									+ rootMessage + "\n");

+							"error" + DELIMITER + 1 + DELIMITER + 1 + DELIMITER + "CDA document load error : " +

+									rootMessage + "\n");

 					}

 

 				}