diff --git a/Examples/REFREQ01 - Referral Service Request New Full - 111 to ED.xml b/Examples/REFREQ01 - Referral Service Request New Full - 111 to ED.xml
index 6053fd74..97703ca1 100644
--- a/Examples/REFREQ01 - Referral Service Request New Full - 111 to ED.xml	
+++ b/Examples/REFREQ01 - Referral Service Request New Full - 111 to ED.xml	
@@ -347,9 +347,9 @@
           <relationship>
             <coding>
               <!--       Emergency contact person      -->
-              <system value="http://terminology.hl7.org/CodeSystem/v3-RoleCode" />
-              <code value="ECON" />
-              <display value="emergency contact" />
+              <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
+              <code value="C" />
+              <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/REFREQ02 - Referral Service Request New Full - 999 to CAS.xml b/Examples/REFREQ02 - Referral Service Request New Full - 999 to CAS.xml
index 53309225..f94d91f4 100644
--- a/Examples/REFREQ02 - Referral Service Request New Full - 999 to CAS.xml	
+++ b/Examples/REFREQ02 - Referral Service Request New Full - 999 to CAS.xml	
@@ -327,8 +327,8 @@
             <coding>
               <!--       Emergency contact person      -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
-              <display value="Emergency contact person" />
+              <code value="C" />
+              <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/REFREQ03 - Referral Service Request New Full - Primary Care to Community Pharmacy - Minor Illness.xml b/Examples/REFREQ03 - Referral Service Request New Full - Primary Care to Community Pharmacy - Minor Illness.xml
index 99ac686c..dcc810a5 100644
--- a/Examples/REFREQ03 - Referral Service Request New Full - Primary Care to Community Pharmacy - Minor Illness.xml	
+++ b/Examples/REFREQ03 - Referral Service Request New Full - Primary Care to Community Pharmacy - Minor Illness.xml	
@@ -341,9 +341,9 @@
           <relationship>
             <coding>
               <!--       Emergency contact person      -->
-              <system value="http://terminology.hl7.org/CodeSystem/v3-RoleCode" />
-              <code value="ECON" />
-              <display value="emergency contact" />
+              <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
+              <code value="C" />
+              <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/REFREQ04 - Referral Service Request - CAD Out of Area.xml b/Examples/REFREQ04 - Referral Service Request - CAD Out of Area.xml
index b2cf19b0..28098d71 100644
--- a/Examples/REFREQ04 - Referral Service Request - CAD Out of Area.xml	
+++ b/Examples/REFREQ04 - Referral Service Request - CAD Out of Area.xml	
@@ -372,8 +372,8 @@
             <coding>
               <!--        Emergency contact person       -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
-              <display value="Emergency contact person" />
+              <code value="C" />
+              <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/REFREQ05 - Referral Service Request - CAD Mutal Aid Request.xml b/Examples/REFREQ05 - Referral Service Request - CAD Mutal Aid Request.xml
index d60113da..aca13558 100644
--- a/Examples/REFREQ05 - Referral Service Request - CAD Mutal Aid Request.xml	
+++ b/Examples/REFREQ05 - Referral Service Request - CAD Mutal Aid Request.xml	
@@ -367,8 +367,8 @@
             <coding>
               <!--        Emergency contact person       -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
-              <display value="Emergency contact person" />
+              <code value="C" />
+              <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/REFREQ06 - Referral Service Request New Full - GP to BP - ABPM.xml b/Examples/REFREQ06 - Referral Service Request New Full - GP to BP - ABPM.xml
index 1ca72324..617cfe8e 100644
--- a/Examples/REFREQ06 - Referral Service Request New Full - GP to BP - ABPM.xml	
+++ b/Examples/REFREQ06 - Referral Service Request New Full - GP to BP - ABPM.xml	
@@ -409,9 +409,9 @@
                     <relationship>
                         <coding>
                             <!--        Emergency contact person       -->
-                            <system value="http://terminology.hl7.org/CodeSystem/v3-RoleCode" />
-                            <code value="ECON" />
-                            <display value="emergency contact" />
+                            <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFREQ07 - Referral Service Request New Full - GP to OC.xml b/Examples/REFREQ07 - Referral Service Request New Full - GP to OC.xml
index bbc02f0a..a6af60ba 100644
--- a/Examples/REFREQ07 - Referral Service Request New Full - GP to OC.xml	
+++ b/Examples/REFREQ07 - Referral Service Request New Full - GP to OC.xml	
@@ -483,9 +483,9 @@
                     <relationship>
                         <coding>
                             <!--        Emergency contact person       -->
-                            <system value="http://terminology.hl7.org/CodeSystem/v3-RoleCode" />
-                            <code value="ECON" />
-                            <display value="emergency contact" />
+                            <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFREQ8A - Referral Service Request - CAD Out of Area C1(1 of 4 - Initial).xml b/Examples/REFREQ8A - Referral Service Request - CAD Out of Area C1(1 of 4 - Initial).xml
index 85124a43..7624de75 100644
--- a/Examples/REFREQ8A - Referral Service Request - CAD Out of Area C1(1 of 4 - Initial).xml	
+++ b/Examples/REFREQ8A - Referral Service Request - CAD Out of Area C1(1 of 4 - Initial).xml	
@@ -265,8 +265,8 @@ Message 1 - Intital Message
                         <coding>
                             <!--         Emergency contact person        -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFREQ8B - Referral Service Request - CAD Out of Area C1(2 of 4 - Update).xml b/Examples/REFREQ8B - Referral Service Request - CAD Out of Area C1(2 of 4 - Update).xml
index f12eb902..af581f7c 100644
--- a/Examples/REFREQ8B - Referral Service Request - CAD Out of Area C1(2 of 4 - Update).xml	
+++ b/Examples/REFREQ8B - Referral Service Request - CAD Out of Area C1(2 of 4 - Update).xml	
@@ -328,8 +328,8 @@ Message 2 - First update
                         <coding>
                             <!--         Emergency contact person        -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFREQ8C - Referral Service Request - CAD Out of Area C1(3 of 4 - Update).xml b/Examples/REFREQ8C - Referral Service Request - CAD Out of Area C1(3 of 4 - Update).xml
index e74e3fba..37fcea15 100644
--- a/Examples/REFREQ8C - Referral Service Request - CAD Out of Area C1(3 of 4 - Update).xml	
+++ b/Examples/REFREQ8C - Referral Service Request - CAD Out of Area C1(3 of 4 - Update).xml	
@@ -457,8 +457,8 @@ Message 3 - Second update
                         <coding>
                             <!--         Emergency contact person        -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFREQ8D - Referral Service Request - CAD Out of Area C1(4 of 4 - Final Update).xml b/Examples/REFREQ8D - Referral Service Request - CAD Out of Area C1(4 of 4 - Final Update).xml
index e62523cf..8c82a8dd 100644
--- a/Examples/REFREQ8D - Referral Service Request - CAD Out of Area C1(4 of 4 - Final Update).xml	
+++ b/Examples/REFREQ8D - Referral Service Request - CAD Out of Area C1(4 of 4 - Final Update).xml	
@@ -464,8 +464,8 @@ Message 4 - Final update
                         <coding>
                             <!--         Emergency contact person        -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(1 of 3 - Initial).xml b/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(1 of 3 - Initial).xml
index af073663..9cd6b251 100644
--- a/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(1 of 3 - Initial).xml	
+++ b/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(1 of 3 - Initial).xml	
@@ -293,8 +293,8 @@ Message 1 - Intital Message
                         <coding>
                             <!--         Emergency contact person        -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(2 of 3 - Update).xml b/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(2 of 3 - Update).xml
index f04d25d9..97bd8960 100644
--- a/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(2 of 3 - Update).xml	
+++ b/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(2 of 3 - Update).xml	
@@ -424,8 +424,8 @@ Message 2 - First update
                         <coding>
                             <!--         Emergency contact person        -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(3 of 3 - Final Update).xml b/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(3 of 3 - Final Update).xml
index a74202b9..f9ba5101 100644
--- a/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(3 of 3 - Final Update).xml	
+++ b/Examples/REFREQ9A - Referral Service Request - CAD Out of Area C2(3 of 3 - Final Update).xml	
@@ -430,8 +430,8 @@ Message 3 - Final update
                         <coding>
                             <!--         Emergency contact person        -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFRESP01 - Referral Service Request Response New Full - ED to 111 Safeguarding DNA Feedback.xml b/Examples/REFRESP01 - Referral Service Request Response New Full - ED to 111 Safeguarding DNA Feedback.xml
index dca7b022..db1e1e4b 100644
--- a/Examples/REFRESP01 - Referral Service Request Response New Full - ED to 111 Safeguarding DNA Feedback.xml	
+++ b/Examples/REFRESP01 - Referral Service Request Response New Full - ED to 111 Safeguarding DNA Feedback.xml	
@@ -348,8 +348,8 @@
             <coding>
               <!--       Emergency contact person      -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
-              <display value="Emergency contact person" />
+              <code value="C" />
+              <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/REFRESP02- Referral Service Request Reponse Short - CAD Mutual Aid Rejection.xml b/Examples/REFRESP02- Referral Service Request Reponse Short - CAD Mutual Aid Rejection.xml
index 6d7b325c..db79f09c 100644
--- a/Examples/REFRESP02- Referral Service Request Reponse Short - CAD Mutual Aid Rejection.xml	
+++ b/Examples/REFRESP02- Referral Service Request Reponse Short - CAD Mutual Aid Rejection.xml	
@@ -298,8 +298,8 @@
                         <coding>
                             <!--        Emergency contact person       -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/REFRESP03 - Referral Service Request Response - CAD Out of Area Response.xml b/Examples/REFRESP03 - Referral Service Request Response - CAD Out of Area Response.xml
index 36c4f3ea..2ac324a2 100644
--- a/Examples/REFRESP03 - Referral Service Request Response - CAD Out of Area Response.xml	
+++ b/Examples/REFRESP03 - Referral Service Request Response - CAD Out of Area Response.xml	
@@ -289,8 +289,8 @@
                         <coding>
                             <!--        Emergency contact person       -->
                             <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-                            <code value="EP" />
-                            <display value="Emergency contact person" />
+                            <code value="C" />
+                            <display value="Emergency Contact" />
                         </coding>
                     </relationship>
                     <name>
diff --git a/Examples/SERVREQ01 - Service Request Update - Revoked.xml b/Examples/SERVREQ01 - Service Request Update - Revoked.xml
index 8595fcd0..d0a1cf5c 100644
--- a/Examples/SERVREQ01 - Service Request Update - Revoked.xml	
+++ b/Examples/SERVREQ01 - Service Request Update - Revoked.xml	
@@ -187,7 +187,8 @@
             <coding>
               <!--    Emergency contact person   -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/SERVREQ02 - Service Request Delete - Entered in error.xml b/Examples/SERVREQ02 - Service Request Delete - Entered in error.xml
index efa3ed61..cfdb2b33 100644
--- a/Examples/SERVREQ02 - Service Request Delete - Entered in error.xml	
+++ b/Examples/SERVREQ02 - Service Request Delete - Entered in error.xml	
@@ -186,7 +186,8 @@
             <coding>
               <!--    Emergency contact person   -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALREQ01 - Validation Service Request New Full - 999 to CAS.xml b/Examples/VALREQ01 - Validation Service Request New Full - 999 to CAS.xml
index ba612191..b64aeb26 100644
--- a/Examples/VALREQ01 - Validation Service Request New Full - 999 to CAS.xml	
+++ b/Examples/VALREQ01 - Validation Service Request New Full - 999 to CAS.xml	
@@ -330,8 +330,8 @@
             <coding>
               <!--       Emergency contact person      -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
-              <display value="Emergency contact person" />
+              <code value="C" />
+              <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALREQ02 - Validation Service Request Update Full - 999 to CAS Lower Priority.xml b/Examples/VALREQ02 - Validation Service Request Update Full - 999 to CAS Lower Priority.xml
index f8a35e98..d884858e 100644
--- a/Examples/VALREQ02 - Validation Service Request Update Full - 999 to CAS Lower Priority.xml	
+++ b/Examples/VALREQ02 - Validation Service Request Update Full - 999 to CAS Lower Priority.xml	
@@ -316,7 +316,8 @@
             <coding>
               <!--    Emergency contact person   -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALREQ03 - Validation Service Request New Full AMPDS - 999 to CAS.xml b/Examples/VALREQ03 - Validation Service Request New Full AMPDS - 999 to CAS.xml
index 83066536..ce91b50f 100644
--- a/Examples/VALREQ03 - Validation Service Request New Full AMPDS - 999 to CAS.xml	
+++ b/Examples/VALREQ03 - Validation Service Request New Full AMPDS - 999 to CAS.xml	
@@ -305,7 +305,8 @@
             <coding>
               <!--     Emergency contact person    -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALRESP01 - Validation Response HTTP Response Acknowledgment - CAS to 999 Planned (0 of 2).xml b/Examples/VALRESP01 - Validation Response HTTP Response Acknowledgment - CAS to 999 Planned (0 of 2).xml
index f72dc798..3e8e4f04 100644
--- a/Examples/VALRESP01 - Validation Response HTTP Response Acknowledgment - CAS to 999 Planned (0 of 2).xml	
+++ b/Examples/VALRESP01 - Validation Response HTTP Response Acknowledgment - CAS to 999 Planned (0 of 2).xml	
@@ -349,7 +349,8 @@
             <coding>
               <!--     Emergency contact person    -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALRESP01A - Validation Response New Interim - CAS to 999 In-progress (1 of 2).xml b/Examples/VALRESP01A - Validation Response New Interim - CAS to 999 In-progress (1 of 2).xml
index 80c18c89..600a9d88 100644
--- a/Examples/VALRESP01A - Validation Response New Interim - CAS to 999 In-progress (1 of 2).xml	
+++ b/Examples/VALRESP01A - Validation Response New Interim - CAS to 999 In-progress (1 of 2).xml	
@@ -272,7 +272,8 @@
             <coding>
               <!--    Emergency contact person   -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALRESP01B - Validation Response Update Full - CAS to 999 Finished (2 of 2).xml b/Examples/VALRESP01B - Validation Response Update Full - CAS to 999 Finished (2 of 2).xml
index cfbdb844..9eedd3c9 100644
--- a/Examples/VALRESP01B - Validation Response Update Full - CAS to 999 Finished (2 of 2).xml	
+++ b/Examples/VALRESP01B - Validation Response Update Full - CAS to 999 Finished (2 of 2).xml	
@@ -361,7 +361,8 @@
             <coding>
               <!--    Emergency contact person   -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALRESP02 - Validation Response New Full - CAS to 999 Finished.xml b/Examples/VALRESP02 - Validation Response New Full - CAS to 999 Finished.xml
index 4264d83c..0b795362 100644
--- a/Examples/VALRESP02 - Validation Response New Full - CAS to 999 Finished.xml	
+++ b/Examples/VALRESP02 - Validation Response New Full - CAS to 999 Finished.xml	
@@ -372,8 +372,8 @@
             <coding>
               <!--       Emergency contact person      -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
-              <display value="Emergency contact person" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALRESP03 - Validation Response New Full - CAS to 999 Finished Inc New CADid Cat 1-2.xml b/Examples/VALRESP03 - Validation Response New Full - CAS to 999 Finished Inc New CADid Cat 1-2.xml
index 20518e55..d770350d 100644
--- a/Examples/VALRESP03 - Validation Response New Full - CAS to 999 Finished Inc New CADid Cat 1-2.xml	
+++ b/Examples/VALRESP03 - Validation Response New Full - CAS to 999 Finished Inc New CADid Cat 1-2.xml	
@@ -413,7 +413,8 @@
             <coding>
               <!--    Emergency contact person   -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALRESP04 - Validation Response Interim - Reject Validation Request.xml b/Examples/VALRESP04 - Validation Response Interim - Reject Validation Request.xml
index a17a3c77..04b598f2 100644
--- a/Examples/VALRESP04 - Validation Response Interim - Reject Validation Request.xml	
+++ b/Examples/VALRESP04 - Validation Response Interim - Reject Validation Request.xml	
@@ -273,7 +273,8 @@
             <coding>
               <!--    Emergency contact person   -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>
diff --git a/Examples/VALRESP05 - Validation Response - Falls to 999 Finished copy.xml b/Examples/VALRESP05 - Validation Response - Falls to 999 Finished copy.xml
index c5071581..e116fa61 100644
--- a/Examples/VALRESP05 - Validation Response - Falls to 999 Finished copy.xml	
+++ b/Examples/VALRESP05 - Validation Response - Falls to 999 Finished copy.xml	
@@ -365,8 +365,8 @@
             <coding>
               <!--       Emergency contact person      -->
               <system value="http://terminology.hl7.org/CodeSystem/v2-0131" />
-              <code value="EP" />
-              <display value="Emergency contact person" />
+              <code value="C" />
+			  <display value="Emergency Contact" />
             </coding>
           </relationship>
           <name>