diff --git a/examples/allergyintolerance-Ibuprofen-psml-03.xml b/examples/allergyintolerance-Ibuprofen-psml-03.xml
new file mode 100644
index 000000000..eddf4dda5
--- /dev/null
+++ b/examples/allergyintolerance-Ibuprofen-psml-03.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AllergyIntolerance xmlns="http://hl7.org/fhir">
+    <id value="ibuprofen-psml-03"/>
+    <clinicalStatus>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical"/>
+            <code value="active"/>
+            <display value="Active"/>
+        </coding>
+    </clinicalStatus>
+    <verificationStatus>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/allergyintolerance-verification"/>
+            <code value="unconfirmed"/>
+            <display value="Unconfirmed"/>
+        </coding>
+    </verificationStatus>
+    <type value="allergy"/>
+    <category value="medication"/>
+    <code>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="293619005"/>
+            <display value="Ibuprofen allergy"/>
+        </coding>
+        <text value="Ibuprofen allergy"/>
+    </code>
+    <patient>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </patient>
+    <encounter>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </encounter>
+    <onsetDateTime value="2016-10"/>
+    <recorder>
+        <!-- relative reference to entry of PractitionerRole resource -->
+        <reference value="PractitionerRole/pharmacist-retail"/>
+    </recorder>
+    <asserter>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </asserter>
+    <reaction>
+        <substance>
+            <coding>
+                <system value="http://snomed.info/sct"/>
+                <code value="21885011000036105"/>
+                <display value="Ibuprofen"/>
+            </coding>
+            <text value="ibuprofen"/>
+        </substance>
+        <manifestation>
+            <coding>
+                <system value="http://snomed.info/sct"/>
+                <code value="39579001"/>
+                <display value="Anaphylaxis"/>
+            </coding>
+            <text value="Anaphylaxis"/>
+        </manifestation>
+    </reaction>
+</AllergyIntolerance>
diff --git a/examples/composition-psml-03.xml b/examples/composition-psml-03.xml
new file mode 100644
index 000000000..c04e9015c
--- /dev/null
+++ b/examples/composition-psml-03.xml
@@ -0,0 +1,512 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composition xmlns="http://hl7.org/fhir">
+    <id value="psml-03"/>
+    <meta>
+        <profile
+            value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-composition-document-1"
+        />
+    </meta>
+    <language value="en-AU"/>
+    <!--WORKAROUND: The contents of Composition.text are a workaround to enable the tooling used to generate this implementation guide
+                to generate a human friendly rendering instead of forcing the reader to refer to XML or JSON format to view the full example narrative.
+                The contents below is not consistent with good or recommended practice. -->
+    <text>
+        <status value="additional"/>
+        <div xmlns="http://www.w3.org/1999/xhtml" lang="en-AU">
+            <table style="border-collapse:collapse;border-spacing:0;width:100%;">
+                <tr>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;font-size:20px;background-color:#333333;color:#ffffff;border:none;text-align:center;vertical-align:top"
+                        colspan="4">Pharmacist Shared Medicines List</th>
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#333333;color:#ffffff;border-color:#000000;text-align:center;vertical-align:top"
+                        colspan="4">11 Dec 2018 01:30 PM </td>
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;background-color:#333333;color:#ffffff;border-color:#000000;text-align:center;vertical-align:top"
+                        >Mac PRIEST</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;background-color:#333333;color:#ffffff;border-color:#000000;text-align:center;vertical-align:top"
+                        >DoB 9 Mar 1989 (30 yrs) </td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;background-color:#333333;color:#ffffff;border-color:#000000;text-align:center;vertical-align:top"
+                        >Gender MALE</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;background-color:#333333;color:#ffffff;border-color:#000000;text-align:center;vertical-align:top"
+                        >IHI 8003608333563104 </td>
+                </tr>
+            </table>
+
+            <h3>Test Org -DigitalHealth 6</h3>
+            <p><b>Address: </b>570 Watcha St, GLEBE, NSW 2037 AU</p>
+            <p><b>HPI-O: </b>8003629900033370</p>
+            <p><b>Pharmacist:</b> Mr. Representative Pharmacist (HPI-I: 8003611566708354)</p>
+            <p><b>Email:</b> pha@gmail.com (work)</p>
+            <p><b>General Practitioner: </b>A Small Main Street Medical Centre</p>
+
+            <h3>Encounter Details</h3>
+            <table style="border-collapse:collapse;border-spacing:0;width:100%;">
+                <tr>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Description</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Start</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >End</th>
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Community pharmacy medicine review</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >11/12/2018 10:00 AM</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >11/12/2018 12:30 PM</td>
+                </tr>
+            </table>
+
+            <h3 style="color:red">Allergies</h3>
+            <table style="border-collapse:collapse;border-spacing:0;width:100%;">
+                <caption>Allergies</caption>
+                <tr>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Substance/Agent</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Reaction Type</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Reaction</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Reaction Onset Date</th>
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >ibuprofen</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Allergic reaction</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Anaphylaxis</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >October 2016</td>
+                </tr>
+            </table>
+
+            <h3>Medicines List</h3>
+            <table style="border-collapse:collapse;border-spacing:0;width:100%;">
+                <caption>Current medicines</caption>
+                <tr>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Medicine</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Brand Name</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Direction</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Medicine Purpose</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Medicine Status</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Expected End Date</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Special Instructions</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Medicine Image</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Physical Description</th>
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Ferro-Grad C</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Take one tablet daily</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Iron supplement</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Unchanged</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                    />
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Amoxicillin 875 mg + clavulanic acid 125 mg tablet</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Augmentin Duo Forte</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Take one tablet twice a day</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Chest infection</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >New</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >20/01/2019</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                    />
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Metformin 500mg tablet</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Sandoz</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Take one tablet twice a day</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Reduce blood sugar</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Amended</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >White and round with 227 imprinted</td>
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Multi-vitamins</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Take one tablet daily</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Unchanged</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                    />
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Paracetamol 665mg tablet</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Panadol Osteo</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Take two tablets every 6 to 8 hours when required</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Osteoarthritis, pain relief</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Unchanged</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >No more than 6 tablets in 24 hours</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"/>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                    />
+                </tr>
+            </table>
+
+            <table style="border-collapse:collapse;border-spacing:0;width:100%;">
+                <caption>Ceased medicines</caption>
+                <tr>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Medicine</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Reason for ceasing medicine</th>
+                    <th
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;font-weight:bold;background-color:#9b9b9b;border-color:#000000;text-align:left;vertical-align:top"
+                        >Ceased date</th>
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Paracetamol 500 mg tablet</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Stopped; duplicated medicine</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Dec 2018</td>
+                </tr>
+                <tr>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >ibuprofen</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                        >Allergic Reaction</td>
+                    <td
+                        style="border-collapse:collapse;border-spacing:0;font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;border-color:#000000;text-align:left;vertical-align:top"
+                    />
+                </tr>
+            </table>
+            <p>Packed medicines: No medicines packed in dose administration aid</p>
+            <p>Please review this list with your pharmacist on or soon after 02/Apr/2019. Community
+                pharmacy medicine review</p>
+        </div>
+    </text>
+    <identifier>
+        <system value="urn:ietf:rfc:3986"/>
+        <value value="urn:uuid:b43fdab3-9c03-4bd1-96bf-cd95fa1f58de"/>
+    </identifier>
+    <status value="final"/>
+    <type>
+        <coding>
+            <system value="http://loinc.org"/>
+            <code value="56445-0"/>
+        </coding>
+        <text value="Pharmacist Shared Medicines List"/>
+    </type>
+    <category>
+        <coding>
+            <system value="http://loinc.org"/>
+            <code value="56445-0"/>
+        </coding>
+    </category>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <encounter>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </encounter>
+    <date value="2018-12-11T13:30:00+10:00"/>
+    <author>
+        <!-- relative reference to entry of Practitioner resource -->
+        <reference value="PractitionerRole/pharmacist-retail"/>
+    </author>
+    <title value="Pharmacist Shared Medicines List"/>
+    <attester>
+        <mode value="legal"/>
+        <time value="2018-12-11T13:30:00+10:00"/>
+        <party>
+            <!-- relative reference to entry of Practitioner resource -->
+            <reference value="PractitionerRole/pharmacist-retail"/>
+        </party>
+    </attester>
+    <custodian>
+        <!-- relative reference to entry of Organization resource -->
+        <reference value="Organization/hi-testdata-pharmacy"/>
+    </custodian>
+    <section>
+        <title value="Medicines List"/>
+        <code>
+            <coding>
+                <system value="http://loinc.org"/>
+                <code value="10160-0"/>
+                <display value="History of Medication use Narrative"/>
+            </coding>
+        </code>
+        <text>
+            <status value="additional"/>
+            <div xmlns="http://www.w3.org/1999/xhtml">
+                <table>
+                    <caption>Current medicines</caption>
+                    <thead>
+                        <tr>
+                            <th>Medicine</th>
+                            <th>Brand name</th>
+                            <th>Direction</th>
+                            <th>Medicine purpose</th>
+                            <th>Medicine status</th>
+                            <th>Expected end date</th>
+                            <th>Special instructions</th>
+                            <th>Medicine Image</th>
+                            <th>Physical Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td/>
+                            <td>Ferro-Grad C</td>
+                            <td>Take one tablet daily</td>
+                            <td>Iron supplement</td>
+                            <td>Unchanged</td>
+                            <td/>
+                            <td/>
+                            <td/>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>Amoxicillin 875 mg + clavulanic acid 125 mg tablet</td>
+                            <td>Augmentin Duo Forte</td>
+                            <td>Take one tablet twice a day</td>
+                            <td>Chest infection</td>
+                            <td>New</td>
+                            <td>20/01/2019</td>
+                            <td/>
+                            <td/>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>Metformin 500mg tablet</td>
+                            <td>Sandoz</td>
+                            <td>Take one tablet twice a day</td>
+                            <td>Reduce blood sugar</td>
+                            <td>Amended</td>
+                            <td/>
+                            <td/>
+                            <td/>
+                            <td>White and round with 227 imprinted</td>
+                        </tr>
+                        <tr>
+                            <td>Multi-vitamins</td>
+                            <td/>
+                            <td>Take one tablet daily</td>
+                            <td/>
+                            <td>Unchanged</td>
+                            <td/>
+                            <td/>
+                            <td/>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>Paracetamol 665 mg tablet</td>
+                            <td>Panadol Osteo</td>
+                            <td>Take two tablets every 6 to 8 hours when required</td>
+                            <td>Osteoarthritis, pain relief</td>
+                            <td>Unchanged</td>
+                            <td/>
+                            <td>No more than 6 tablets in 24 hours</td>
+                            <td/>
+                            <td/>
+                        </tr>
+                    </tbody>
+                </table>
+                <table>
+                    <caption>Ceased medicines</caption>
+                    <thead>
+                        <tr>
+                            <th>Medicine</th>
+                            <th>Reason for ceasing medicine</th>
+                            <th>Ceased date</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td/>
+                            <td>Paracetamol 500mg tablet</td>
+                            <td>Stopped; duplicated medicine</td>
+                            <td>Dec 2018</td>
+                        </tr>
+                        <tr>
+                            <td>Ibuprofen</td>
+                            <td>Allergic Reaction</td>
+                            <td/>
+                        </tr>
+                    </tbody>
+                </table>
+                <p>Packed medicines: No medicines packed in dose administration aid</p>
+                <p>Please review this list with your pharmacist on or soon after 02/Apr/2019.
+                    Community pharmacy medicine review</p>
+            </div>
+        </text>
+        <entry>
+            <!-- relative reference to entry of List resource -->
+            <reference value="List/psml-03"/>
+        </entry>
+    </section>
+    <section>
+        <title value="Allergies"/>
+        <code>
+            <coding>
+                <system value="http://loinc.org"/>
+                <code value="48765-2"/>
+            </coding>
+        </code>
+        <text>
+            <status value="additional"/>
+            <div xmlns="http://www.w3.org/1999/xhtml">
+                <table>
+                    <caption>Allergies</caption>
+                    <thead>
+                        <tr>
+                            <th>Substance/Agent</th>
+                            <th>Reaction Type</th>
+                            <th>Reaction</th>
+                            <th>Reaction Onset Date</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>Ibuprofen</td>
+                            <td>Allergic reaction</td>
+                            <td>Anaphylaxis</td>
+                            <td>October 2016</td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </text>
+        <entry>
+            <!-- relative reference to entry of AllergyIntolerance resource -->
+            <reference value="AllergyIntolerance/ibuprofen-psml-03"/>
+        </entry>
+    </section>
+</Composition>
diff --git a/examples/encounter-psml-03.xml b/examples/encounter-psml-03.xml
new file mode 100644
index 000000000..3a189625a
--- /dev/null
+++ b/examples/encounter-psml-03.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+            <Encounter xmlns="http://hl7.org/fhir">
+                <id value="psml-03"/>
+                <status value="finished"/>
+                <class>
+                    <system value="http://terminology.hl7.org/CodeSystem/v3-ActCode"/>
+                    <code value="AMB"/>
+                    <display value="ambulatory"/>                    
+                </class>
+                <type>
+                    <coding>
+                        <system value="http://snomed.info/sct"/>
+                        <code value="1348961000168104"/>
+                        <display value="Community pharmacy medicines review"/>
+                    </coding>
+                    <text value="Community pharmacy medicine review"/>
+                </type>
+                <serviceType>
+                    <coding>
+                        <system value="http://snomed.info/sct"/>
+                        <code value="182836005"/>
+                        <display value="Review of medication"/>
+                    </coding>
+                    <text value="Medicines review"/>
+                </serviceType>
+                <subject>
+                    <!--relative reference to Patient resource-->
+                    <reference value="Patient/hi-testdata-priest-mac"/>
+                </subject>
+                <participant>
+                    <type>
+                        <coding>
+                            <system value="http://terminology.hl7.org/CodeSystem/v3-ParticipationType"/>
+                            <code value="PPRF"/>
+                            <display value="primary performer"/>   
+                        </coding>
+                    </type>
+                    <individual>
+                        <!--relative reference to PractitionerRole resource-->
+                        <reference value="PractitionerRole/pharmacist-retail"/>
+                    </individual>
+                </participant>
+                <period>
+                    <start value="2018-12-11T10:00:00+10:00"/>
+                    <end value="2018-12-11T13:30:00+10:00"/>
+                </period>
+            </Encounter>
\ No newline at end of file
diff --git a/examples/list-psml-03.xml b/examples/list-psml-03.xml
new file mode 100644
index 000000000..e1a264c9b
--- /dev/null
+++ b/examples/list-psml-03.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<List xmlns="http://hl7.org/fhir">
+    <id value="psml-03"/>
+    <meta>
+        <profile
+            value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-list-medication-use-pmr-1"
+        />
+    </meta>
+    <language value="en-AU"/>
+    <extension
+        url="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-packed-in-daa-1">
+        <valueCodeableConcept>
+            <coding>
+                <system value="http://snomed.info/sct"/>
+                <code value="1469421000168108"/>
+                <display value="No medicines on list packed in dose administration aid"/>
+            </coding>
+        </valueCodeableConcept>
+    </extension>
+    <status value="current"/>
+    <mode value="snapshot"/>
+    <title value="Medicines List"/>
+    <code>
+        <coding>
+            <system value="http://loinc.org"/>
+            <code value="10160-0"/>
+            <display value="History of Medication use Narrative"/>
+        </coding>
+    </code>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <encounter>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </encounter>
+    <date value="2018-12-11T13:30:00+10:00"/>
+    <source>
+        <!-- relative reference to entry of Practitioner resource -->
+        <reference value="PractitionerRole/pharmacist-retail"/>
+    </source>
+    <note>
+        <text
+            value="Please review this list with your pharmacist on or soon
+                        after 02/Apr/2019."
+        />
+    </note>
+    <entry>
+        <flag>
+            <coding>
+                <system value="http://terminology.hl7.org.au/CodeSystem/medicine-item-change"/>
+                <code value="nochange"/>
+                <display value="Unchanged"/>
+            </coding>
+        </flag>
+        <item>
+            <!-- relative reference to entry of MedicationStatement resource -->
+            <reference value="MedicationStatement/active-ironsup-psml-03"/>
+        </item>
+    </entry>
+    <entry>
+        <extension url="http://hl7.org.au/fhir/StructureDefinition/change-description">
+            <valueString value="Chest infection"/>
+        </extension>
+        <flag>
+            <coding>
+                <system value="http://terminology.hl7.org.au/CodeSystem/medicine-item-change"/>
+                <code value="new"/>
+                <display value="New"/>
+            </coding>
+        </flag>
+        <item>
+            <!-- relative reference to entry of MedicationStatement resource -->
+            <reference value="MedicationStatement/active-amoxicillin-psml-03"/>
+        </item>
+    </entry>
+    <entry>
+        <extension url="http://hl7.org.au/fhir/StructureDefinition/change-description">
+            <valueString value="Dose increased from 250mg to 500mg"/>
+        </extension>
+        <flag>
+            <coding>
+                <system value="http://terminology.hl7.org.au/CodeSystem/medicine-item-change"/>
+                <code value="amended"/>
+                <display value="Amended"/>
+            </coding>
+        </flag>
+        <item>
+            <!-- relative reference to entry of MedicationStatement resource -->
+            <reference value="MedicationStatement/active-metformin-psml-03"/>
+        </item>
+    </entry>
+    <entry>
+        <flag>
+            <coding>
+                <system value="http://terminology.hl7.org.au/CodeSystem/medicine-item-change"/>
+                <code value="nochange"/>
+                <display value="Unchanged"/>
+            </coding>
+        </flag>
+        <item>
+            <!-- relative reference to entry of MedicationStatement resource -->
+            <reference value="MedicationStatement/active-multivitamins-psml-03"/>
+        </item>
+    </entry>
+    <entry>
+        <flag>
+            <coding>
+                <system value="http://terminology.hl7.org.au/CodeSystem/medicine-item-change"/>
+                <code value="nochange"/>
+                <display value="Unchanged"/>
+            </coding>
+        </flag>
+        <item>
+            <!-- relative reference to entry of MedicationStatement resource -->
+            <reference value="MedicationStatement/active-paracetamol-psml-03"/>
+        </item>
+    </entry>
+    <entry>
+        <extension url="http://hl7.org.au/fhir/StructureDefinition/change-description">
+            <valueString value="Duplicated medicine"/>
+        </extension>
+        <flag>
+            <coding>
+                <system value="http://terminology.hl7.org.au/CodeSystem/medicine-item-change"/>
+                <code value="ceased"/>
+                <display value="Ceased"/>
+            </coding>
+        </flag>
+        <item>
+            <!-- relative reference to entry of MedicationStatement resource -->
+            <reference value="MedicationStatement/stopped-paracetamol-psml-03"/>
+        </item>
+    </entry>
+    <entry>
+        <extension url="http://hl7.org.au/fhir/StructureDefinition/change-description">
+            <valueString value="Allergic reaction"/>
+        </extension>
+        <flag>
+            <coding>
+                <system value="http://terminology.hl7.org.au/CodeSystem/medicine-item-change"/>
+                <code value="ceased"/>
+            </coding>
+        </flag>
+        <item>
+            <!-- relative reference to entry of MedicationStatement resource -->
+            <reference value="MedicationStatement/stopped-ibuprofen-psml-03"/>
+        </item>
+    </entry>
+</List>
diff --git a/examples/medication-amoxicillin-01.xml b/examples/medication-amoxicillin-01.xml
new file mode 100644
index 000000000..7a82b0f54
--- /dev/null
+++ b/examples/medication-amoxicillin-01.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Medication xmlns="http://hl7.org/fhir">
+    <id value="amoxicillin-01"/>
+    <extension url="http://hl7.org.au/fhir/StructureDefinition/medication-brand-name">
+        <valueString value="Augmentin Duo Forte"/>
+    </extension>
+    <code>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="28152011000036108"/>
+            <display value="amoxicillin 875 mg + clavulanic acid 125 mg tablet, 10"/>
+        </coding>
+        <coding>
+            <system value="http://pbs.gov.au/code/item"/>
+            <code value="5006L"/>
+            <display value="amoxicillin 875 mg + clavulanic acid 125 mg tablet, 10"/>
+        </coding>
+        <text value="Amoxicillin 875 mg + clavulanic acid 125 mg tablet, Augmentin Duo Forte"/>
+    </code>
+</Medication>
diff --git a/examples/medication-ibuprofen-01.xml b/examples/medication-ibuprofen-01.xml
new file mode 100644
index 000000000..d20ee6323
--- /dev/null
+++ b/examples/medication-ibuprofen-01.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Medication xmlns="http://hl7.org/fhir">
+    <id value="ibuprofen-01"/>
+    <code>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="21885011000036105"/>
+            <display value="Ibuprofen"/>
+        </coding>
+        <coding>
+            <system value="http://pbs.gov.au/code/item"/>
+            <code value="3192B"/>
+            <display value="IBUPROFEN"/>
+        </coding>
+        <text value="Ibuprofen"/>
+    </code>
+</Medication>
diff --git a/examples/medication-ironsup-01.xml b/examples/medication-ironsup-01.xml
new file mode 100644
index 000000000..5747f3cc2
--- /dev/null
+++ b/examples/medication-ironsup-01.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Medication xmlns="http://hl7.org/fhir">
+    <id value="ironsup-01"/>
+    <code>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="53373011000036103"/>
+            <display value="Ferro-Grad C"/>
+        </coding>
+        <text value="Ferro-Grad C"/>
+    </code>
+    <form>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="154011000036109"/>
+            <display value="tablet"/>
+        </coding>
+    </form>
+</Medication>
diff --git a/examples/medication-metformin-01.xml b/examples/medication-metformin-01.xml
new file mode 100644
index 000000000..ce62917b5
--- /dev/null
+++ b/examples/medication-metformin-01.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Medication xmlns="http://hl7.org/fhir">
+    <id value="metformin-01"/>
+    <extension url="http://hl7.org.au/fhir/StructureDefinition/medication-brand-name">
+        <valueString value="Sandoz"/>
+    </extension>
+    <code>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="23358011000036102"/>
+            <display value="metformin hydrochloride 500 mg tablet"/>
+        </coding>
+        <coding>
+            <system value="http://pbs.gov.au/code/item"/>
+            <code value="2430X"/>
+            <display value="metformin hydrochloride 500 mg tablet, 100"/>
+        </coding>
+        <text value="Metformin 500mg tablet, Sandoz"/>
+    </code>
+</Medication>
diff --git a/examples/medication-multivitamins-01.xml b/examples/medication-multivitamins-01.xml
new file mode 100644
index 000000000..14cebcd45
--- /dev/null
+++ b/examples/medication-multivitamins-01.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Medication xmlns="http://hl7.org/fhir">
+    <id value="multivitamins-01"/>
+    <code>
+        <text value="Multi-vitamins"/>
+    </code>
+    <form>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="154011000036109"/>
+            <display value="tablet"/>
+        </coding>
+    </form>
+</Medication>
diff --git a/examples/medication-paracetamol-01.xml b/examples/medication-paracetamol-01.xml
new file mode 100644
index 000000000..2d17578e2
--- /dev/null
+++ b/examples/medication-paracetamol-01.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Medication xmlns="http://hl7.org/fhir">
+    <id value="paracetamol-01"/>
+    <code>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="23628011000036109"/>
+            <display value="paracetamol 500 mg tablet"/>
+        </coding>
+        <text value="Paracetamol 500 mg tablet"/>
+    </code>
+</Medication>
diff --git a/examples/medication-paracetamol-02.xml b/examples/medication-paracetamol-02.xml
new file mode 100644
index 000000000..fb215a977
--- /dev/null
+++ b/examples/medication-paracetamol-02.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Medication xmlns="http://hl7.org/fhir">
+    <id value="paracetamol-02"/>
+    <extension url="http://hl7.org.au/fhir/StructureDefinition/medication-brand-name">
+        <valueString value="Panadol Osteo"/>
+    </extension>
+    <extension url="http://hl7.org.au/fhir/StructureDefinition/medication-generic-name">
+        <valueString value="Paracetamol 665mg tablet"/>
+    </extension>
+    <code>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="22075011000036103"/>
+            <display value="paracetamol 665 mg modified release tablet"/>
+        </coding>
+        <coding>
+            <system value="http://pbs.gov.au/code/item"/>
+            <code value="8814X"/>
+            <display value="paracetamol 665 mg modified release tablet, 96"/>
+        </coding>
+        <text value="Paracetamol 665mg tablet; Panadol Osteo"/>
+    </code>
+    <form>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="261011000036101"/>
+            <display value="modified release tablet"/>
+        </coding>
+    </form>
+    <ingredient>
+        <itemCodeableConcept>
+            <coding>
+                <system value="http://snomed.info/sct"/>
+                <code value="21433011000036107"/>
+                <display value="Paracetamol"/>
+            </coding>
+        </itemCodeableConcept>
+        <strength>
+            <numerator>
+                <value value="665"/>
+                <unit value="mg"/>
+                <system value="http://unitsofmeasure.org"/>
+                <code value="mg"/>
+            </numerator>
+            <denominator>
+                <value value="1"/>
+            </denominator>
+        </strength>
+    </ingredient>
+</Medication>
diff --git a/examples/medicationstatement-active-amoxicillin-psml-03.xml b/examples/medicationstatement-active-amoxicillin-psml-03.xml
new file mode 100644
index 000000000..9c7becdcf
--- /dev/null
+++ b/examples/medicationstatement-active-amoxicillin-psml-03.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MedicationStatement xmlns="http://hl7.org/fhir">
+    <id value="active-amoxicillin-psml-03"/>
+    <status value="active"/>
+    <category>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/medication-statement-category"/>
+            <code value="community"/>
+            <display value="Community"/>
+        </coding>
+    </category>
+    <medicationReference>
+        <!-- relative reference to entry of Medication resource -->
+        <reference value="Medication/amoxicillin-01"/>
+    </medicationReference>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <context>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </context>
+    <effectivePeriod>
+        <end value="2019-01-20"/>
+    </effectivePeriod>
+    <dateAsserted value="2018-12-11T13:30:00+10:00"/>
+    <reasonCode>
+        <text value="Chest infection"/>
+    </reasonCode>
+    <dosage>
+        <text value="Take one tablet twice a day"/>
+        <timing>
+            <repeat>
+                <frequency value="2"/>
+                <period value="1"/>
+                <periodUnit value="d"/>
+            </repeat>
+        </timing>
+        <doseAndRate>
+            <doseQuantity>
+                <value value="1"/>
+                <unit value="tablet"/>
+                <system value="http://snomed.info/sct"/>
+                <code value="154011000036109"/>
+            </doseQuantity>
+        </doseAndRate>
+    </dosage>
+</MedicationStatement>
diff --git a/examples/medicationstatement-active-ironsup-psml-03.xml b/examples/medicationstatement-active-ironsup-psml-03.xml
new file mode 100644
index 000000000..dfa279f9a
--- /dev/null
+++ b/examples/medicationstatement-active-ironsup-psml-03.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MedicationStatement xmlns="http://hl7.org/fhir">
+    <id value="active-ironsup-psml-03"/>
+    <status value="active"/>
+    <category>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/medication-statement-category"/>
+            <code value="community"/>
+            <display value="Community"/>
+        </coding>
+    </category>
+    <medicationReference>
+        <!-- relative reference to entry of Medication resource -->
+        <reference value="Medication/ironsup-01"/>
+    </medicationReference>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <context>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </context>
+    <dateAsserted value="2018-12-11T13:30:00+10:00"/>
+    <reasonCode>
+        <text value="Iron supplement"/>
+    </reasonCode>
+    <dosage>
+        <text value="Take one tablet daily"/>
+        <timing>
+            <repeat>
+                <frequency value="1"/>
+                <period value="1"/>
+                <periodUnit value="d"/>
+            </repeat>
+        </timing>
+        <doseAndRate>
+            <doseQuantity>
+                <value value="1"/>
+                <unit value="tablet"/>
+                <system value="http://snomed.info/sct"/>
+                <code value="154011000036109"/>
+            </doseQuantity>
+        </doseAndRate>
+    </dosage>
+</MedicationStatement>
diff --git a/examples/medicationstatement-active-metformin-psml-03.xml b/examples/medicationstatement-active-metformin-psml-03.xml
new file mode 100644
index 000000000..4f1e90efa
--- /dev/null
+++ b/examples/medicationstatement-active-metformin-psml-03.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MedicationStatement xmlns="http://hl7.org/fhir">
+    <id value="active-metformin-psml-03"/>
+    <status value="active"/>
+    <category>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/medication-statement-category"/>
+            <code value="community"/>
+            <display value="Community"/>
+        </coding>
+    </category>
+    <medicationReference>
+        <!-- relative reference to entry of Medication resource -->
+        <reference value="Medication/metformin-01"/>
+    </medicationReference>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <context>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </context>
+    <dateAsserted value="2018-12-11T13:30:00+10:00"/>
+    <reasonCode>
+        <text value="Reduce blood sugar"/>
+    </reasonCode>
+    <dosage>
+        <text value="Take one tablet twice a day"/>
+        <timing>
+            <repeat>
+                <frequency value="2"/>
+                <period value="1"/>
+                <periodUnit value="d"/>
+            </repeat>
+        </timing>
+        <doseAndRate>
+            <doseQuantity>
+                <value value="1"/>
+                <unit value="tablet"/>
+                <system value="http://snomed.info/sct"/>
+                <code value="154011000036109"/>
+            </doseQuantity>
+        </doseAndRate>
+    </dosage>
+</MedicationStatement>
diff --git a/examples/medicationstatement-active-multivitamins-psml-03.xml b/examples/medicationstatement-active-multivitamins-psml-03.xml
new file mode 100644
index 000000000..c46168a25
--- /dev/null
+++ b/examples/medicationstatement-active-multivitamins-psml-03.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MedicationStatement xmlns="http://hl7.org/fhir">
+    <id value="active-multivitamins-psml-03"/>
+    <status value="active"/>
+    <category>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/medication-statement-category"/>
+            <code value="community"/>
+            <display value="Community"/>
+        </coding>
+    </category>
+    <medicationReference>
+        <!-- relative reference to entry of Medication resource -->
+        <reference value="Medication/multivitamins-01"/>
+    </medicationReference>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <context>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </context>
+    <dateAsserted value="2018-12-11T13:30:00+10:00"/>
+    <dosage>
+        <text value="Take one tablet daily"/>
+        <timing>
+            <repeat>
+                <frequency value="1"/>
+                <period value="1"/>
+                <periodUnit value="d"/>
+            </repeat>
+        </timing>
+        <doseAndRate>
+            <doseQuantity>
+                <value value="1"/>
+                <unit value="tablet"/>
+                <system value="http://snomed.info/sct"/>
+                <code value="154011000036109"/>
+            </doseQuantity>
+        </doseAndRate>
+    </dosage>
+</MedicationStatement>
diff --git a/examples/medicationstatement-active-paracetamol-psml-03.xml b/examples/medicationstatement-active-paracetamol-psml-03.xml
new file mode 100644
index 000000000..ed73d8a11
--- /dev/null
+++ b/examples/medicationstatement-active-paracetamol-psml-03.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MedicationStatement xmlns="http://hl7.org/fhir">
+    <id value="active-paracetamol-psml-03"/>
+    <status value="active"/>
+    <category>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/medication-statement-category"/>
+            <code value="community"/>
+            <display value="Community"/>
+        </coding>
+    </category>
+    <medicationReference>
+        <!-- relative reference to entry of Medication resource -->
+        <reference value="Medication/paracetamol-02"/>
+    </medicationReference>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <context>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </context>
+    <dateAsserted value="2018-12-11T13:30:00+10:00"/>
+    <reasonCode>
+        <text value="Osteoarthritis, pain relief"/>
+    </reasonCode>
+    <dosage>
+        <text
+            value="Take two tablets every 6 to 8 hours when required; No more than 6 tablets in 24 hours"/>
+        <timing>
+            <repeat>
+                <frequency value="1"/>
+                <period value="6"/>
+                <periodMax value="8"/>
+                <periodUnit value="h"/>
+            </repeat>
+        </timing>
+        <asNeededBoolean value="true"/>
+        <doseAndRate>
+            <doseQuantity>
+                <value value="2"/>
+                <unit value="tablets"/>
+                <system value="http://snomed.info/sct"/>
+                <code value="154011000036109"/>
+            </doseQuantity>
+        </doseAndRate>
+        <maxDosePerPeriod>
+            <numerator>
+                <value value="6"/>
+                <unit value="tablets"/>
+                <system value="http://snomed.info/sct"/>
+                <code value="154011000036109"/>
+            </numerator>
+            <denominator>
+                <value value="24"/>
+                <unit value="hours"/>
+                <system value="http://unitsofmeasure.org"/>
+                <code value="h"/>
+            </denominator>
+        </maxDosePerPeriod>
+    </dosage>
+</MedicationStatement>
diff --git a/examples/medicationstatement-stopped-ibuprofen-psml-03.xml b/examples/medicationstatement-stopped-ibuprofen-psml-03.xml
new file mode 100644
index 000000000..16ca56f1d
--- /dev/null
+++ b/examples/medicationstatement-stopped-ibuprofen-psml-03.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MedicationStatement xmlns="http://hl7.org/fhir">
+    <id value="stopped-ibuprofen-psml-03"/>
+    <status value="stopped"/>
+    <category>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/medication-statement-category"/>
+            <code value="community"/>
+            <display value="Community"/>
+        </coding>
+    </category>
+    <medicationReference>
+        <!-- relative reference to entry of Medication resource -->
+        <reference value="Medication/ibuprofen-01"/>
+    </medicationReference>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <context>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </context>
+    <dateAsserted value="2018-12-11T13:30:00+10:00"/>
+</MedicationStatement>
diff --git a/examples/medicationstatement-stopped-paracetamol-psml-03.xml b/examples/medicationstatement-stopped-paracetamol-psml-03.xml
new file mode 100644
index 000000000..238b804ac
--- /dev/null
+++ b/examples/medicationstatement-stopped-paracetamol-psml-03.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MedicationStatement xmlns="http://hl7.org/fhir">
+    <id value="stopped-paracetamol-psml-03"/>
+    <status value="stopped"/>
+    <category>
+        <coding>
+            <system value="http://terminology.hl7.org/CodeSystem/medication-statement-category"/>
+            <code value="community"/>
+            <display value="Community"/>
+        </coding>
+    </category>
+    <medicationReference>
+        <!-- relative reference to entry of Medication resource -->
+        <reference value="Medication/paracetamol-01"/>
+    </medicationReference>
+    <subject>
+        <!-- relative reference to entry of Patient resource -->
+        <reference value="Patient/hi-testdata-priest-mac"/>
+    </subject>
+    <context>
+        <!-- relative reference to entry of Encounter resource -->
+        <reference value="Encounter/psml-03"/>
+    </context>
+    <effectivePeriod>
+        <end value="2018-12"/>
+    </effectivePeriod>
+    <dateAsserted value="2018-12-11T13:30:00+10:00"/>
+</MedicationStatement>
diff --git a/examples/organization-small-med-centre.xml b/examples/organization-small-med-centre.xml
new file mode 100644
index 000000000..cb7cfae50
--- /dev/null
+++ b/examples/organization-small-med-centre.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Organization xmlns="http://hl7.org/fhir">
+    <id value="small-med-centr"/>
+    <type>
+        <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="288565001"/>
+            <display value="Medical centre"/>
+        </coding>
+    </type>
+    <name value="A Small Main Street Medical Centre"/>
+</Organization>
diff --git a/examples/practitioner-pharmacist-representative.xml b/examples/practitioner-pharmacist-representative.xml
new file mode 100644
index 000000000..03cb0e5d7
--- /dev/null
+++ b/examples/practitioner-pharmacist-representative.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Practitioner xmlns="http://hl7.org/fhir">
+    <id value="pharmacist-representative"/>
+    <identifier>
+        <type>
+            <coding>
+                <system value="http://terminology.hl7.org/CodeSystem/v2-0203"/>
+                <code value="NPI"/>
+                <display value="National provider identifier"/>
+            </coding>
+            <text value="HPI-I"/>
+        </type>
+        <system value="http://ns.electronichealth.net.au/id/hi/hpii/1.0"/>
+        <value value="8003611566708354"/>
+    </identifier>
+    <name>
+        <family value="Pharmacist"/>
+        <given value="Representative"/>
+        <prefix value="Mr."/>
+    </name>
+    <qualification>
+        <code>
+            <text value="Bachelor of Pharmacy"/>
+        </code>
+    </qualification>
+</Practitioner>
diff --git a/examples/practitionerrole-pharmacist-retail.xml b/examples/practitionerrole-pharmacist-retail.xml
new file mode 100644
index 000000000..8e1d987a3
--- /dev/null
+++ b/examples/practitionerrole-pharmacist-retail.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PractitionerRole xmlns="http://hl7.org/fhir">
+    <id value="pharmacist-retail"/>
+    <identifier>
+        <type>
+            <coding>
+                <system value="http://terminology.hl7.org/CodeSystem/v2-0203"/>
+                <code value="NPI"/>
+                <display value="National provider identifier"/>
+            </coding>
+            <text value="HPI-I"/>
+        </type>
+        <system value="http://ns.electronichealth.net.au/id/hi/hpii/1.0"/>
+        <value value="8003611566708354"/>
+    </identifier>
+    <practitioner>
+        <!-- relative reference to entry of Practitioner resource -->
+        <reference value="Practitioner/pharmacist-representative"/>
+    </practitioner>
+    <organization>
+        <!-- relative reference to entry of Organization resource -->
+        <reference value="Organization/hi-testdata-pharmacy"/>
+    </organization>
+    <code>
+        <coding>
+            <system value="http://www.abs.gov.au/ausstats/abs@.nsf/mf/1220.0"/>
+            <code value="251513"/>
+            <display value="Retail Pharmacist"/>
+        </coding>
+        <text value="Pharmacist"/>
+    </code>
+    <telecom>
+        <system value="email"/>
+        <value value="pha@gmail.com"/>
+        <use value="work"/>
+    </telecom>
+</PractitionerRole>
diff --git a/pages/_includes/dh-allergyintolerance-core-1-examples.md b/pages/_includes/dh-allergyintolerance-core-1-examples.md
index 50f1d4354..8e9ed8c46 100644
--- a/pages/_includes/dh-allergyintolerance-core-1-examples.md
+++ b/pages/_includes/dh-allergyintolerance-core-1-examples.md
@@ -24,5 +24,12 @@
       <td><a href="Bundle-psml-03-doc.xml.html">XML</a></td>
       <td><a href="Bundle-psml-03-doc.json.html">JSON</a></td>
       <td><a href="Bundle-psml-03-doc.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="AllergyIntolerance-ibuprofen-psml-03.html">Ibuprofen allergy entry for Mac PRIEST - Community pharmacy medicine review (2018)</a></td>
+      <td>ibuprofen-psml-03</td>
+      <td><a href="AllergyIntolerance-ibuprofen-psml-03.xml.html">XML</a></td>
+      <td><a href="AllergyIntolerance-ibuprofen-psml-03.json.html">JSON</a></td>
+      <td><a href="AllergyIntolerance-ibuprofen-psml-03.ttl.html">Turtle</a></td>
    </tr>           
 </table>
\ No newline at end of file
diff --git a/pages/_includes/dh-composition-document-1-examples.md b/pages/_includes/dh-composition-document-1-examples.md
index 8016e17ca..d3d725dda 100644
--- a/pages/_includes/dh-composition-document-1-examples.md
+++ b/pages/_includes/dh-composition-document-1-examples.md
@@ -33,11 +33,18 @@
       <td><a href="Composition-phn-01.ttl.html">Turtle</a></td>
    </tr>
    <tr>
-      <td><a href="Bundle-psml-01-doc.html">Pharmacist Shared Medicines List Document Bundle for Mrs Bonny Goodwin (2019)</a></td>
+      <td><a href="Composition-psml-01.html">Pharmacist Shared Medicines List Document Bundle for Mrs Bonny Goodwin (2019)</a></td>
       <td>psml-01-doc</td>
-      <td><a href="Bundle-psml-01-doc.xml.html">XML</a></td>
-      <td><a href="Bundle-psml-01-doc.json.html">JSON</a></td>
-      <td><a href="Bundle-psml-01-doc.ttl.html">Turtle</a></td>
+      <td><a href="Composition-psml-01.xml.html">XML</a></td>
+      <td><a href="Composition-psml-01.json.html">JSON</a></td>
+      <td><a href="Composition-psml-01.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="Composition-psml-03.html">Pharmacist Shared Medicines List Document Composition for Mac PRIEST (2018)</a></td>
+      <td>psml-03-doc</td>
+      <td><a href="Composition-psml-03.xml.html">XML</a></td>
+      <td><a href="Composition-psml-03.json.html">JSON</a></td>
+      <td><a href="Composition-psml-03.ttl.html">Turtle</a></td>
    </tr>
    <tr>
       <td><a href="Bundle-psml-03-doc.html">Pharmacist Shared Medicines List Document Bundle for Mac PRIEST (2018)</a></td>
diff --git a/pages/_includes/dh-encounter-core-1-examples.md b/pages/_includes/dh-encounter-core-1-examples.md
index 740efa37c..4c0edd0c9 100644
--- a/pages/_includes/dh-encounter-core-1-examples.md
+++ b/pages/_includes/dh-encounter-core-1-examples.md
@@ -4,6 +4,13 @@
      <th>id</th>
      <th colspan="3">Format</th>
    </tr>
+   <tr>
+      <td><a href="Encounter-psml-03.html">Community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>psml-03</td>
+      <td><a href="Encounter-psml-03.xml.html">XML</a></td>
+      <td><a href="Encounter-psml-03.json.html">JSON</a></td>
+      <td><a href="Encounter-psml-03.ttl.html">Turtle</a></td>
+   </tr>
    <tr>
       <td><a href="Bundle-es-02-doc.html">Follow-Up Encounter included in Event Summary Document Bundle for Mr Zhang Wei (2020)</a></td>
       <td>es-02-doc</td>
diff --git a/pages/_includes/dh-list-core-1-examples.md b/pages/_includes/dh-list-core-1-examples.md
index 0b41e2237..802e7fa98 100644
--- a/pages/_includes/dh-list-core-1-examples.md
+++ b/pages/_includes/dh-list-core-1-examples.md
@@ -11,6 +11,13 @@
       <td><a href="Bundle-psml-01-doc.json.html">JSON</a></td>
       <td><a href="Bundle-psml-01-doc.ttl.html">Turtle</a></td>
    </tr>
+   <tr>
+      <td><a href="Bundle-psml-01.html">History of medicines use list included in Payload Bundle (logical references only) for Mrs Bonny Goodwin</a></td>
+      <td>psml-01</td>
+      <td><a href="Bundle-psml-01.xml.html">XML</a></td>
+      <td><a href="Bundle-psml-01.json.html">JSON</a></td>
+      <td><a href="Bundle-psml-01.ttl.html">Turtle</a></td>
+   </tr>
    <tr>
       <td><a href="Bundle-psml-03-doc.html">Current medicines list included in Pharmacist Shared Medicines List Document Bundle for Mac PRIEST (2018)</a></td>
       <td>psml-03-doc</td>
@@ -18,4 +25,11 @@
       <td><a href="Bundle-psml-03-doc.json.html">JSON</a></td>
       <td><a href="Bundle-psml-03-doc.ttl.html">Turtle</a></td>
    </tr>
+   <tr>
+      <td><a href="List-psml-03.html">Medicines List from Community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>psml-03</td>
+      <td><a href="List-psml-03.xml.html">XML</a></td>
+      <td><a href="List-psml-03.json.html">JSON</a></td>
+      <td><a href="List-psml-03.ttl.html">Turtle</a></td>
+   </tr>
 </table>
\ No newline at end of file
diff --git a/pages/_includes/dh-list-medication-use-1-examples.md b/pages/_includes/dh-list-medication-use-1-examples.md
index 0b41e2237..802e7fa98 100644
--- a/pages/_includes/dh-list-medication-use-1-examples.md
+++ b/pages/_includes/dh-list-medication-use-1-examples.md
@@ -11,6 +11,13 @@
       <td><a href="Bundle-psml-01-doc.json.html">JSON</a></td>
       <td><a href="Bundle-psml-01-doc.ttl.html">Turtle</a></td>
    </tr>
+   <tr>
+      <td><a href="Bundle-psml-01.html">History of medicines use list included in Payload Bundle (logical references only) for Mrs Bonny Goodwin</a></td>
+      <td>psml-01</td>
+      <td><a href="Bundle-psml-01.xml.html">XML</a></td>
+      <td><a href="Bundle-psml-01.json.html">JSON</a></td>
+      <td><a href="Bundle-psml-01.ttl.html">Turtle</a></td>
+   </tr>
    <tr>
       <td><a href="Bundle-psml-03-doc.html">Current medicines list included in Pharmacist Shared Medicines List Document Bundle for Mac PRIEST (2018)</a></td>
       <td>psml-03-doc</td>
@@ -18,4 +25,11 @@
       <td><a href="Bundle-psml-03-doc.json.html">JSON</a></td>
       <td><a href="Bundle-psml-03-doc.ttl.html">Turtle</a></td>
    </tr>
+   <tr>
+      <td><a href="List-psml-03.html">Medicines List from Community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>psml-03</td>
+      <td><a href="List-psml-03.xml.html">XML</a></td>
+      <td><a href="List-psml-03.json.html">JSON</a></td>
+      <td><a href="List-psml-03.ttl.html">Turtle</a></td>
+   </tr>
 </table>
\ No newline at end of file
diff --git a/pages/_includes/dh-list-medication-use-pmr-1-examples.md b/pages/_includes/dh-list-medication-use-pmr-1-examples.md
index 0b41e2237..802e7fa98 100644
--- a/pages/_includes/dh-list-medication-use-pmr-1-examples.md
+++ b/pages/_includes/dh-list-medication-use-pmr-1-examples.md
@@ -11,6 +11,13 @@
       <td><a href="Bundle-psml-01-doc.json.html">JSON</a></td>
       <td><a href="Bundle-psml-01-doc.ttl.html">Turtle</a></td>
    </tr>
+   <tr>
+      <td><a href="Bundle-psml-01.html">History of medicines use list included in Payload Bundle (logical references only) for Mrs Bonny Goodwin</a></td>
+      <td>psml-01</td>
+      <td><a href="Bundle-psml-01.xml.html">XML</a></td>
+      <td><a href="Bundle-psml-01.json.html">JSON</a></td>
+      <td><a href="Bundle-psml-01.ttl.html">Turtle</a></td>
+   </tr>
    <tr>
       <td><a href="Bundle-psml-03-doc.html">Current medicines list included in Pharmacist Shared Medicines List Document Bundle for Mac PRIEST (2018)</a></td>
       <td>psml-03-doc</td>
@@ -18,4 +25,11 @@
       <td><a href="Bundle-psml-03-doc.json.html">JSON</a></td>
       <td><a href="Bundle-psml-03-doc.ttl.html">Turtle</a></td>
    </tr>
+   <tr>
+      <td><a href="List-psml-03.html">Medicines List from Community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>psml-03</td>
+      <td><a href="List-psml-03.xml.html">XML</a></td>
+      <td><a href="List-psml-03.json.html">JSON</a></td>
+      <td><a href="List-psml-03.ttl.html">Turtle</a></td>
+   </tr>
 </table>
\ No newline at end of file
diff --git a/pages/_includes/dh-medication-core-1-examples.md b/pages/_includes/dh-medication-core-1-examples.md
index 67707db40..c1547764f 100644
--- a/pages/_includes/dh-medication-core-1-examples.md
+++ b/pages/_includes/dh-medication-core-1-examples.md
@@ -4,6 +4,55 @@
      <th>id</th>
      <th colspan="3">Format</th>
    </tr>
+   <tr>
+      <td><a href="Medication-ironsup-01.html">Ferro-Grad C</a></td>
+      <td>ironsup-01</td>
+      <td><a href="Medication-ironsup-01.xml.html">XML</a></td>
+      <td><a href="Medication-ironsup-01.json.html">JSON</a></td>
+      <td><a href="Medication-ironsup-01.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="Medication-ibuprofen-01.html">Ibuprofen</a></td>
+      <td>ibuprofen-01</td>
+      <td><a href="Medication-ibuprofen-01.xml.html">XML</a></td>
+      <td><a href="Medication-ibuprofen-01.json.html">JSON</a></td>
+      <td><a href="Medication-ibuprofen-01.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="Medication-metformin-01.html">Metformin 500mg tablet, Sandoz</a></td>
+      <td>metformin-01</td>
+      <td><a href="Medication-metformin-01.xml.html">XML</a></td>
+      <td><a href="Medication-metformin-01.json.html">JSON</a></td>
+      <td><a href="Medication-metformin-01.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="Medication-multivitamins-01.html">Multi-vitamins</a></td>
+      <td>multivitamins-01</td>
+      <td><a href="Medication-multivitamins-01.xml.html">XML</a></td>
+      <td><a href="Medication-multivitamins-01.json.html">JSON</a></td>
+      <td><a href="Medication-multivitamins-01.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="Medication-paracetamol-01.html">Paracetamol 500 mg tablet</a></td>
+      <td>paracetamol-01</td>
+      <td><a href="Medication-paracetamol-01.xml.html">XML</a></td>
+      <td><a href="Medication-paracetamol-01.json.html">JSON</a></td>
+      <td><a href="Medication-paracetamol-01.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="Medication-paracetamol-02.html">Panadol Osteo Paracetamol 665 mg modified release tablet</a></td>
+      <td>paracetamol-02</td>
+      <td><a href="Medication-paracetamol-02.xml.html">XML</a></td>
+      <td><a href="Medication-paracetamol-02.json.html">JSON</a></td>
+      <td><a href="Medication-paracetamol-02.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="Medication-amoxicillin-01.html">Amoxicillin 875 mg + clavulanic acid 125 mg tablet, Augmentin Duo Forte</a></td>
+      <td>amoxicillin-01</td>
+      <td><a href="Medication-amoxicillin-01.xml.html">XML</a></td>
+      <td><a href="Medication-amoxicillin-01.json.html">JSON</a></td>
+      <td><a href="Medication-amoxicillin-01.ttl.html">Turtle</a></td>
+   </tr>
    <tr>
       <td><a href="Bundle-psml-01-doc.html">Medication entries included in Pharmacist Shared Medicines List Document Bundle for Mrs Bonny Goodwin (2019)</a></td>
       <td>psml-01-doc</td>
diff --git a/pages/_includes/dh-medicationstatement-core-1-examples.md b/pages/_includes/dh-medicationstatement-core-1-examples.md
index 59cbab863..29e4b1498 100644
--- a/pages/_includes/dh-medicationstatement-core-1-examples.md
+++ b/pages/_includes/dh-medicationstatement-core-1-examples.md
@@ -4,6 +4,55 @@
      <th>id</th>
      <th colspan="3">Format</th>
    </tr>
+   <tr>
+      <td><a href="MedicationStatement-active-amoxicillin-psml-03.html">Active Amoxicillin 875 mg use recorded in community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>active-amoxicillin-psml-03</td>
+      <td><a href="Medication-active-amoxicillin-psml-03.xml.html">XML</a></td>
+      <td><a href="Medication-active-amoxicillin-psml-03.json.html">JSON</a></td>
+      <td><a href="Medication-active-amoxicillin-psml-03.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="MedicationStatement-active-ironsup-psml-03.html">Active Ferro-Grad C use recorded in community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>active-ironsup-psml-03</td>
+      <td><a href="Medication-active-ironsup-psml-03.xml.html">XML</a></td>
+      <td><a href="Medication-active-ironsup-psml-03.json.html">JSON</a></td>
+      <td><a href="Medication-active-ironsup-psml-03.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="MedicationStatement-active-metformin-psml-03.html">Active Metformin 500mg tablet use recorded in community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>active-metformin-psml-03</td>
+      <td><a href="Medication-active-metformin-psml-03.xml.html">XML</a></td>
+      <td><a href="Medication-active-metformin-psml-03.json.html">JSON</a></td>
+      <td><a href="Medication-active-metformin-psml-03.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="MedicationStatement-active-multivitamins-psml-03.html">Active Multi-vitamins use recorded in community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>active-multivitamins-psml-03</td>
+      <td><a href="Medication-active-multivitamins-psml-03.xml.html">XML</a></td>
+      <td><a href="Medication-active-multivitamins-psml-03.json.html">JSON</a></td>
+      <td><a href="Medication-active-multivitamins-psml-03.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="MedicationStatement-active-paracetamol-psml-03.html">Active Panadol Osteo use recorded in community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>active-paracetamol-psml-03</td>
+      <td><a href="Medication-active-paracetamol-psml-03.xml.html">XML</a></td>
+      <td><a href="Medication-active-paracetamol-psml-03.json.html">JSON</a></td>
+      <td><a href="Medication-active-paracetamol-psml-03.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="MedicationStatement-stopped-ibuprofen-psml-03.html">Stopped Ibuprofen use recorded in community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>stopped-ibuprofen-psml-03</td>
+      <td><a href="Medication-stopped-ibuprofen-psml-03.xml.html">XML</a></td>
+      <td><a href="Medication-stopped-ibuprofen-psml-03.json.html">JSON</a></td>
+      <td><a href="Medication-stopped-ibuprofen-psml-03.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="MedicationStatement-stopped-paracetamol-psml-03.html">Stopped Paracetamol 500 mg tablet use recorded in community pharmacy medicine review for Mac PRIEST (2018)</a></td>
+      <td>stopped-paracetamol-psml-03</td>
+      <td><a href="Medication-stopped-paracetamol-psml-03.xml.html">XML</a></td>
+      <td><a href="Medication-stopped-paracetamol-psml-03.json.html">JSON</a></td>
+      <td><a href="Medication-stopped-paracetamol-psml-03.ttl.html">Turtle</a></td>
+   </tr>
    <tr>
       <td><a href="Bundle-es-02-doc.html">New Medicine Item entries included in Event Summary Document Bundle for Mr Zhang Wei (2020)</a></td>
       <td>es-02-doc</td>
diff --git a/pages/_includes/dh-medicationstatement-core-1-intro.md b/pages/_includes/dh-medicationstatement-core-1-intro.md
index e39a79779..d61875b39 100644
--- a/pages/_includes/dh-medicationstatement-core-1-intro.md
+++ b/pages/_includes/dh-medicationstatement-core-1-intro.md
@@ -28,7 +28,7 @@ MedicationStatement.status represents the current state of the medicine item for
     <tr>
         <td>new medicine item</td>
         <td>‘new’ or ‘prescribed’</td>
-        <td>'intended'</td>
+        <td>'intended' or 'active'</td>
     </tr>
     <tr>
         <td>existing unchanged medicine item</td>
@@ -62,34 +62,29 @@ MedicationStatement.status represents the current state of the medicine item for
     </tr>
 </table>
 
-The datetime in effective[x] is to be interpreted in regards to the combination of status and/or taken values, as per the guidance in the following table.
+The datetime in effective[x] is to be interpreted in regards to the status values, as per the guidance in the following table.
 
 <table  class="list" width="100%">
 	<col style="width:25%"/>
 	<col style="width:25%"/>
 	<col style="width:50%"/>
     <tr>
-        <th>MedicationStatement.taken</th>
         <th>MedicationStatement.status</th>
         <th>Interpretation</th>
     </tr>
     <tr>
-        <td>'n'</td>
-        <td>‘active’ ‘on-hold’ or ‘intended’</td>
+        <td>‘intended’</td>
         <td>effective[x] is the interval of time during which it is being asserted the patient intends to take or is instructed to take a medicine item</td>
     </tr>
     <tr>
-        <td>'n'</td>
-        <td>‘completed’</td>
+        <td>‘not-taken’</td>
         <td>effective[x] is the interval of time during which it is being asserted that the patient was not taking a medicine</td>
     </tr>
     <tr>
-        <td>'y'</td>
-        <td>‘active’, ‘on-hold’ or ‘intended’</td>
+        <td>‘active’</td>
         <td>effective[x] is the interval of time during which it is being asserted that the patient is taking a medicine. The end date of the period is expected to be omitted; if included, the end date represents the date the patient is expected to stop taking a medicine item.</td>
     </tr>   
     <tr>
-        <td>'y'</td>
         <td>‘completed’</td>
         <td>effective[x] is the interval of time during which it is being asserted that the patient was taking a medicine</td>
     </tr>               
diff --git a/pages/_includes/dh-organization-core-1-examples.md b/pages/_includes/dh-organization-core-1-examples.md
index f385f08e4..142d54fa7 100644
--- a/pages/_includes/dh-organization-core-1-examples.md
+++ b/pages/_includes/dh-organization-core-1-examples.md
@@ -10,5 +10,12 @@
       <td><a href="Organization-algrester-medical-centre.xml.html">XML</a></td>
       <td><a href="Organization-algrester-medical-centre.json.html">JSON</a></td>
       <td><a href="Organization-algrester-medical-centre.ttl.html">Turtle</a></td>
-   </tr>                  
+   </tr>  
+   <tr>
+      <td><a href="Organization-hi-testdata-pharmacy.html">Test Org -DigitalHealth 6 (Vendor Environment HI Test Data)</a></td>
+      <td>hi-testdata-pharmacy</td>
+      <td><a href="Organization-hi-testdata-pharmacy.xml.html">XML</a></td>
+      <td><a href="Organization-hi-testdata-pharmacy.json.html">JSON</a></td>
+      <td><a href="Organization-hi-testdata-pharmacy.ttl.html">Turtle</a></td>
+   </tr>                
 </table>
\ No newline at end of file
diff --git a/pages/_includes/dh-practitioner-core-1-examples.md b/pages/_includes/dh-practitioner-core-1-examples.md
index d1ebde7d8..a0ec0c098 100644
--- a/pages/_includes/dh-practitioner-core-1-examples.md
+++ b/pages/_includes/dh-practitioner-core-1-examples.md
@@ -10,5 +10,12 @@
       <td><a href="Practitioner-algrester-greg.xml.html">XML</a></td>
       <td><a href="Practitioner-algrester-greg.json.html">JSON</a></td>
       <td><a href="Practitioner-algrester-greg.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="Practitioner-pharmacist-representative.html">Mr. Representative Pharmacist</a></td>
+      <td>pharmacist-representative</td>
+      <td><a href="Practitioner-pharmacist-representative.xml.html">XML</a></td>
+      <td><a href="Practitioner-pharmacist-representative.json.html">JSON</a></td>
+      <td><a href="Practitioner-pharmacist-representative.ttl.html">Turtle</a></td>
    </tr>                  
 </table>
\ No newline at end of file
diff --git a/pages/_includes/dh-practitionerrole-author-1-examples.md b/pages/_includes/dh-practitionerrole-author-1-examples.md
index b37e4cb82..661299b6d 100644
--- a/pages/_includes/dh-practitionerrole-author-1-examples.md
+++ b/pages/_includes/dh-practitionerrole-author-1-examples.md
@@ -10,5 +10,12 @@
       <td><a href="PractitionerRole-algrester-greg-gp.xml.html">XML</a></td>
       <td><a href="PractitionerRole-algrester-greg-gp.json.html">JSON</a></td>
       <td><a href="PractitionerRole-algrester-greg-gp.ttl.html">Turtle</a></td>
-   </tr>                  
+   </tr>   
+   <tr>
+      <td><a href="PractitionerRole-pharmacist-retail.html">Mr. Representative Pharmacist, Pharmacist, at Test Org -DigitalHealth 6</a></td>
+      <td>pharmacist-retail</td>
+      <td><a href="PractitionerRole-pharmacist-retail.xml.html">XML</a></td>
+      <td><a href="PractitionerRole-pharmacist-retail.json.html">JSON</a></td>
+      <td><a href="PractitionerRole-pharmacist-retail.ttl.html">Turtle</a></td>
+   </tr>               
 </table>
\ No newline at end of file
diff --git a/pages/_includes/dh-practitionerrole-core-1-examples.md b/pages/_includes/dh-practitionerrole-core-1-examples.md
index b37e4cb82..6b82800b0 100644
--- a/pages/_includes/dh-practitionerrole-core-1-examples.md
+++ b/pages/_includes/dh-practitionerrole-core-1-examples.md
@@ -10,5 +10,12 @@
       <td><a href="PractitionerRole-algrester-greg-gp.xml.html">XML</a></td>
       <td><a href="PractitionerRole-algrester-greg-gp.json.html">JSON</a></td>
       <td><a href="PractitionerRole-algrester-greg-gp.ttl.html">Turtle</a></td>
+   </tr>
+   <tr>
+      <td><a href="PractitionerRole-pharmacist-retail.html">Mr. Representative Pharmacist, Pharmacist, at Test Org -DigitalHealth 6</a></td>
+      <td>pharmacist-retail</td>
+      <td><a href="PractitionerRole-pharmacist-retail.xml.html">XML</a></td>
+      <td><a href="PractitionerRole-pharmacist-retail.json.html">JSON</a></td>
+      <td><a href="PractitionerRole-pharmacist-retail.ttl.html">Turtle</a></td>
    </tr>                  
 </table>
\ No newline at end of file
diff --git a/resources/implementationguide-core-1.xml b/resources/implementationguide-core-1.xml
index de8d37b69..bd34e7515 100644
--- a/resources/implementationguide-core-1.xml
+++ b/resources/implementationguide-core-1.xml
@@ -418,7 +418,14 @@
             <exampleBoolean value="false"/>
         </resource>
         <!--EXAMPLES-->
-
+        <!--ALLERGYINTEROLANCE EXAMPLES-->
+        <resource>
+            <reference>
+                <reference value="AllergyIntolerance/ibuprofen-psml-03"/>
+            </reference>
+            <name value="Ibuprofen allergy entry for Mac PRIEST - Community pharmacy medicine review (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-allergyintolerance-core-1"/>
+        </resource>
         <!--DOCUMENT EXAMPLES-->
         <resource>
             <reference>
@@ -495,9 +502,16 @@
                 <reference value="Bundle/psml-03-doc"/>
             </reference>
             <name value="Pharmacist Shared Medicines List Document Bundle for Mac PRIEST"/>
-            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-bundle-document-1"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-composition-document-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="Composition/psml-03"/>
+            </reference>
+            <name value="Pharmacist Shared Medicines List Document Composition for Mac PRIEST"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-composition-document-1"/>
         </resource>
-        <!--DOCUMENT REFERENCES-->
+        <!--DOCUMENTREFERENCE EXAMPLES-->
         <resource>
             <reference>
                 <reference value="DocumentReference/acp-01"/>
@@ -512,6 +526,122 @@
             <name value="Goals of Care Document Reference for Mr Zhang Wei"/>
             <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/4.0/StructureDefinition/dh-documentreference-acp-1"/>
         </resource>
+        <!--ENCOUNTER EXAMPLES-->
+        <resource>
+            <reference>
+                <reference value="Encounter/psml-03"/>
+            </reference>
+            <name value="Community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/4.0/StructureDefinition/dh-encounter-core-1"/>
+        </resource>
+        <!--LIST EXAMPLES-->
+        <resource>
+            <reference>
+                <reference value="List/psml-03"/>
+            </reference>
+            <name value="Medicines List from Community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-list-medication-use-pmr-1"/>
+        </resource>
+        <!--MEDICATION EXAMPLES-->
+        <resource>
+            <reference>
+                <reference value="Medication/ironsup-01"/>
+            </reference>
+            <name value="Ferro-Grad C"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medication-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="Medication/ibuprofen-01"/>
+            </reference>
+            <name value="Ibuprofen"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medication-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="Medication/metformin-01"/>
+            </reference>
+            <name value="Metformin 500mg tablet, Sandoz"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medication-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="Medication/multivitamins-01"/>
+            </reference>
+            <name value="Multi-vitamins"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medication-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="Medication/paracetamol-01"/>
+            </reference>
+            <name value="Paracetamol 500 mg tablet"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medication-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="Medication/paracetamol-02"/>
+            </reference>
+            <name value="Panadol Osteo Paracetamol 665 mg modified release tablet"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medication-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="Medication/amoxicillin-01"/>
+            </reference>
+            <name value="Amoxicillin 875 mg + clavulanic acid 125 mg tablet, Augmentin Duo Forte"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medication-core-1"/>
+        </resource>
+        <!--MEDICATIONSTATEMENT EXAMPLES-->
+        <resource>
+            <reference>
+                <reference value="MedicationStatement/active-amoxicillin-psml-03"/>
+            </reference>
+            <name value="Active Amoxicillin 875 mg use recorded in community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medicationstatement-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="MedicationStatement/active-ironsup-psml-03"/>
+            </reference>
+            <name value="Active Ferro-Grad C use recorded in community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medicationstatement-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="MedicationStatement/active-metformin-psml-03"/>
+            </reference>
+            <name value="Active Metformin 500mg tablet use recorded in community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medicationstatement-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="MedicationStatement/active-multivitamins-psml-03"/>
+            </reference>
+            <name value="Active Multi-vitamins use recorded in community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medicationstatement-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="MedicationStatement/active-paracetamol-psml-03"/>
+            </reference>
+            <name value="Active Panadol Osteo use recorded in community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medicationstatement-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="MedicationStatement/stopped-ibuprofen-psml-03"/>
+            </reference>
+            <name value="Stopped Ibuprofen use recorded in community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medicationstatement-core-1"/>
+        </resource>
+        <resource>
+            <reference>
+                <reference value="MedicationStatement/stopped-paracetamol-psml-03"/>
+            </reference>
+            <name value="Stopped Paracetamol 500 mg tablet use recorded in community pharmacy medicine review for Mac PRIEST (2018)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-medicationstatement-core-1"/>
+        </resource>
         <!-- ORGANIZATION EXAMPLES-->
         <resource>
             <reference>
@@ -520,6 +650,13 @@
             <name value="Algregster Medical Centre"/>
             <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-organization-core-1"/>
         </resource>
+        <resource>
+            <reference>
+                <reference value="Organization/hi-testdata-pharmacy"/>
+            </reference>
+            <name value="Test Org -DigitalHealth 6 (Vendor Environment HI Test Data)"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-organization-core-1"/>
+        </resource>
         <!--PATIENT EXAMPLES-->
         <resource>
             <reference>
@@ -564,6 +701,13 @@
             <name value="Dr. Greg Algrester"/>
             <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-practitioner-core-1"/>
         </resource>
+        <resource>
+            <reference>
+                <reference value="Practitioner/pharmacist-representative"/>
+            </reference>
+            <name value="Mr. Representative Pharmacist"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-practitioner-core-1"/>
+        </resource>
         <!-- PRACTITIONERROLE EXAMPLES-->
         <resource>
             <reference>
@@ -572,7 +716,13 @@
             <name value="Dr. Greg Algrester, GP, at Algregster Medical Centre"/>
             <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-practitionerrole-author-1"/>
         </resource>
-        
+        <resource>
+            <reference>
+                <reference value="PractitionerRole/pharmacist-retail"/>
+            </reference>
+            <name value="Mr. Representative Pharmacist, Pharmacist, at Test Org -DigitalHealth 6"/>
+            <exampleCanonical value="http://ns.electronichealth.net.au/ci/fhir/StructureDefinition/dh-practitionerrole-author-1"/>
+        </resource>
         <!--TERMINOLOGY INCLUSIONS TO CHECK AGAINST WARNINGS-->
         <resource>
             <reference>