diff --git a/r5/narrative/output/sd-obligations.html b/r5/narrative/output/sd-obligations.html
index 5125122d..5f3aadd2 100644
--- a/r5/narrative/output/sd-obligations.html
+++ b/r5/narrative/output/sd-obligations.html
@@ -9,6 +9,9 @@
       <th style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy">
         <a href="https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views" title="Obligations that apply to all actors">All Actors</a>
       </th>
+      <th style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy">
+        <a href="https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views" title="Obligations that apply to the undefined actor http://hl7.org/fhir/test/ActorDefinition/client ">org/fhir/test/ActorDefinition/client</a>
+      </th>
       <th style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy">
         <a href="https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views" title="Obligations that apply to the actor Server Actor ">ServerActor</a>
         <span style="float: right">
@@ -22,6 +25,15 @@
          <a href="test.html#AllergyIntolerance">AllergyIntolerance</a>
         <a name="AllergyIntolerance"> </a>
       </td>
+      <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy">
+        <b>SHALL</b>
+:        <span title="obligation: in-narrative">in-narrative</span>
+ &amp;         <b>SHOULD</b>
+:        <span title="obligation: user-input">user-input</span>
+ (        <span>
+<i>Elements: </i>        </span>
+clinicalStatus, clinicalStatus, onset[x]:onsetPeriod.start)
+      </td>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
@@ -35,6 +47,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white">
@@ -48,6 +61,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7">
@@ -60,6 +74,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white">
@@ -72,6 +87,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7">
@@ -86,7 +102,7 @@
         <ul>
           <li>
             <b>SHALL</b>
-:            <span title="obligation: will-send">send</span>
+:            <span title="obligation: populate">populate</span>
  &amp;             <b>SHOULD</b>
 :            <span title="obligation: display">display</span>
  (            <a href="https://en.wikipedia.org/wiki/ISO_3166-2:AU" title="ISO 3166-1 Codes for the representation of names of countries and their subdivisions — Part 1: Country code: Australia">Australia</a>
@@ -97,6 +113,13 @@
 :            <span title="obligation: unaltered">unaltered</span>
  (            <span title="where(coding.code.exists())">
 <code>This only applies to values with a code (not text only)</code>            </span>
+)
+          </li>
+          <li>
+            <b>SHOULD</b>
+:            <span title="obligation: persist">persist</span>
+ (            <span title="where(coding.code.exists())">
+<code>This only applies to values with a code (not text only)</code>            </span>
 )
           </li>
         </ul>
@@ -108,6 +131,24 @@
 <code>This only applies to values with a code (not text only)</code>        </span>
 )
       </td>
+      <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy">
+        <ul>
+          <li>
+            <b>SHALL</b>
+:            <span title="obligation: unaltered">unaltered</span>
+ (            <span title="where(coding.code.exists())">
+<code>This only applies to values with a code (not text only)</code>            </span>
+)
+          </li>
+          <li>
+            <b>SHOULD</b>
+:            <span title="obligation: persist">persist</span>
+ (            <span title="where(coding.code.exists())">
+<code>This only applies to values with a code (not text only)</code>            </span>
+)
+          </li>
+        </ul>
+      </td>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white">
@@ -120,6 +161,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7">
@@ -132,6 +174,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white">
@@ -144,6 +187,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7">
@@ -157,6 +201,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white">
@@ -169,6 +214,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7">
@@ -181,6 +227,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white">
@@ -194,6 +241,7 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr style="border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7">
@@ -207,10 +255,11 @@
       </td>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
       <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
+      <td style="vertical-align: top; text-align : left; background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px" class="hierarchy"/>
     </tr>
 
     <tr>
-      <td colspan="3" class="hierarchy">
+      <td colspan="4" class="hierarchy">
         <br/>
         <a href="https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views" title="Legend for this format">
 <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3goXBCwdPqAP0wAAAldJREFUOMuNk0tIlFEYhp9z/vE2jHkhxXA0zJCMitrUQlq4lnSltEqCFhFG2MJFhIvIFpkEWaTQqjaWZRkp0g26URZkTpbaaOJkDqk10szoODP//7XIMUe0elcfnPd9zsfLOYplGrpRwZaqTtw3K7PtGem7Q6FoidbGgqHVy/HRb669R+56zx7eRV1L31JGxYbBtjKK93cxeqfyQHbehkZbUkK20goELEuIzEd+dHS+qz/Y8PTSif0FnGkbiwcAjHaU1+QWOptFiyCLp/LnKptpqIuXHx6rbR26kJcBX3yLgBfnd7CxwJmflpP2wUg0HIAoUUpZBmKzELGWcN8nAr6Gpu7tLU/CkwAaoKTWRSQyt89Q8w6J+oVQkKnBoblH7V0PPvUOvDYXfopE/SJmALsxnVm6LbkotrUtNowMeIrVrBcBpaMmdS0j9df7abpSuy7HWehwJdt1lhVwi/J58U5beXGAF6c3UXLycw1wdFklArBn87xdh0ZsZtArghBdAA3+OEDVubG4UEzP6x1FOWneHh2VDAHBAt80IbdXDcesNoCvs3E5AFyNSU5nbrDPZpcUEQQTFZiEVx+51fxMhhyJEAgvlriadIJZZksRuwBYMOPBbO3hePVVqgEJhFeUuFLhIPkRP6BQLIBrmMenujm/3g4zc398awIe90Zb5A1vREALqneMcYgP/xVQWlG+Ncu5vgwwlaUNx+3799rfe96u9K0JSDXcOzOTJg4B6IgmXfsygc7/Bvg9g9E58/cDVmGIBOP/zT8Bz1zqWqpbXIsd0O9hajXfL6u4BaOS6SeWAAAAAElFTkSuQmCC" alt="doco" style="background-color: inherit"/> Documentation for this format
diff --git a/r5/narrative/sd-obligations.xml b/r5/narrative/sd-obligations.xml
index 0d74edb4..1b91cf0d 100644
--- a/r5/narrative/sd-obligations.xml
+++ b/r5/narrative/sd-obligations.xml
@@ -44,6 +44,23 @@
   <derivation value="constraint"/>
   <differential>
     <element id="AllergyIntolerance">
+      <extension url="http://hl7.org/fhir/StructureDefinition/obligation">
+        <extension url="code">
+          <valueCode value="SHALL:in-narrative"/>
+        </extension>
+        <extension url="code">
+          <valueCode value="SHOULD:user-input"/>
+        </extension>
+        <extension url="elementId">
+          <valueString value="AllergyIntolerance.clinicalStatus"/>
+        </extension>
+        <extension url="elementId">
+          <valueString value="AllergyIntolerance.clinicalStatus"/>
+        </extension>
+        <extension url="elementId">
+          <valueString value="AllergyIntolerance.onset[x]:onsetPeriod.start"/>
+        </extension>
+      </extension>
       <path value="AllergyIntolerance"/>
     </element>
     <element id="AllergyIntolerance.extension:abatement-datetime">
@@ -73,9 +90,12 @@
       </type>
     </element>
     <element id="AllergyIntolerance.type">
-      <extension url="http://hl7.org/fhir/tools/StructureDefinition/obligation">
+      <extension url="http://hl7.org/fhir/StructureDefinition/obligation">
+        <extension url="code">
+          <valueCode value="SHALL:populate"/>
+        </extension>
         <extension url="code">
-          <valueCode value="SHALL:will-send+SHOULD:display"/>
+          <valueCode value="SHOULD:display"/>
         </extension>
         <extension url="documentation">
           <valueMarkdown value="All Australian applications have to understand this element correctly"/>
@@ -99,6 +119,26 @@
         <extension url="code">
           <valueCode value="SHALL:unaltered"/>
         </extension>
+        <extension url="actor">
+          <valueCanonical value="http://hl7.org/fhir/test/ActorDefinition/client"/>
+        </extension>
+        <extension url="actor">
+          <valueCanonical value="http://hl7.org/fhir/test/ActorDefinition/server"/>
+        </extension>
+        <extension url="documentation">
+          <valueMarkdown value="Servers can't change this value"/>
+        </extension>
+        <extension url="filter-desc">
+          <valueString value="where(coding.code.exists())"/>
+        </extension>
+        <extension url="filter">
+          <valueMarkdown value="This only applies to values with a code (not text only)"/>
+        </extension>
+      </extension>
+      <extension url="http://hl7.org/fhir/StructureDefinition/obligation">
+        <extension url="code">
+          <valueCode value="SHOULD:persist"/>
+        </extension>
         <extension url="actor">
           <valueCanonical value="http://hl7.org/fhir/test/ActorDefinition/server"/>
         </extension>