diff --git a/shared/enumerations/enumerations.bpmn b/shared/enumerations/enumerations.bpmn
index aeb88ab9..937be132 100644
--- a/shared/enumerations/enumerations.bpmn
+++ b/shared/enumerations/enumerations.bpmn
@@ -5,11 +5,7 @@
       <bpmn:outgoing>Flow_0q0h9tc</bpmn:outgoing>
     </bpmn:startEvent>
     <bpmn:sequenceFlow id="Flow_0q0h9tc" sourceRef="StartEvent_1" targetRef="Call_Shared_Build_Enum_List_from_AWS" />
-    <bpmn:endEvent id="Event_0fdez0y">
-      <bpmn:incoming>Flow_1igx0a1</bpmn:incoming>
-    </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_0t80m1i" sourceRef="enumeration_user_task" targetRef="Activity_1pdtwik" />
-    <bpmn:sequenceFlow id="Flow_1igx0a1" sourceRef="Activity_18npi29" targetRef="Event_0fdez0y" />
     <bpmn:manualTask id="Activity_18npi29" name="Show Records">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Enumerations:
@@ -22,10 +18,8 @@
 {% endfor %}
 </spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_03owp8l</bpmn:incoming>
-      <bpmn:outgoing>Flow_1igx0a1</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:sequenceFlow id="Flow_1sjh867" sourceRef="Activity_1cl0n43" targetRef="Activity_1slo4pb" />
+    <bpmn:sequenceFlow id="Flow_1sjh867" sourceRef="Activity_1cl0n43" targetRef="Activity_1ad6wc2" />
     <bpmn:serviceTask id="Activity_1cl0n43" name="Add Record">
       <bpmn:extensionElements>
         <spiffworkflow:serviceTaskOperator id="aws/AddDynamoItem" resultVariable="enumerationsAdd">
@@ -38,18 +32,6 @@
       <bpmn:incoming>Flow_0322grc</bpmn:incoming>
       <bpmn:outgoing>Flow_1sjh867</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_03owp8l" sourceRef="Activity_1slo4pb" targetRef="Activity_18npi29" />
-    <bpmn:serviceTask id="Activity_1slo4pb" name="Get Records">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="aws/ScanDynamoTable" resultVariable="enumerations">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="table_name" type="str" value="&#39;Enumeration&#39;" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1sjh867</bpmn:incoming>
-      <bpmn:outgoing>Flow_03owp8l</bpmn:outgoing>
-    </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_1p5fxob" sourceRef="Call_Shared_Build_Enum_List_from_AWS" targetRef="Activity_1ig6ogz" />
     <bpmn:callActivity id="Call_Shared_Build_Enum_List_from_AWS" name="Call Shared: Build Enum List from AWS" calledElement="Shared_Build_Enum_List_from_AWS">
       <bpmn:extensionElements>
@@ -101,15 +83,29 @@ for n in range(0, enumerations_items_list_cnt):
       <bpmn:incoming>Flow_0t80m1i</bpmn:incoming>
       <bpmn:outgoing>Flow_10v778k</bpmn:outgoing>
     </bpmn:manualTask>
+    <bpmn:serviceTask id="Activity_1ad6wc2" name="Get Enumeration List">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="aws/QueryDynamoTable">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="partition_key" type="str" value="addSubject" />
+            <spiffworkflow:parameter id="sort_key" type="str" value="addValue" />
+            <spiffworkflow:parameter id="table_name" type="str" value="&#39;Enumeration&#39;" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1sjh867</bpmn:incoming>
+      <bpmn:outgoing>Flow_1bvuyh3</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:endEvent id="Event_0d2gsze">
+      <bpmn:incoming>Flow_1bvuyh3</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_1bvuyh3" sourceRef="Activity_1ad6wc2" targetRef="Event_0d2gsze" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Sharred_Enumeration_Table">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="-278" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0fdez0y_di" bpmnElement="Event_0fdez0y">
-        <dc:Bounds x="1342" y="159" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1cpupwx_di" bpmnElement="Activity_18npi29">
         <dc:Bounds x="1190" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -117,10 +113,6 @@ for n in range(0, enumerations_items_list_cnt):
         <dc:Bounds x="860" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1fe77xz_di" bpmnElement="Activity_1slo4pb">
-        <dc:Bounds x="1030" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1i2gua9_di" bpmnElement="Call_Shared_Build_Enum_List_from_AWS">
         <dc:Bounds x="-170" y="137" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -141,6 +133,12 @@ for n in range(0, enumerations_items_list_cnt):
       <bpmndi:BPMNShape id="Activity_0vetp9n_di" bpmnElement="Activity_1pdtwik">
         <dc:Bounds x="520" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1oz9lvi_di" bpmnElement="Activity_1ad6wc2">
+        <dc:Bounds x="1020" y="137" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0d2gsze_di" bpmnElement="Event_0d2gsze">
+        <dc:Bounds x="1052" y="292" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_0q0h9tc_di" bpmnElement="Flow_0q0h9tc">
         <di:waypoint x="-242" y="177" />
         <di:waypoint x="-170" y="177" />
@@ -149,17 +147,9 @@ for n in range(0, enumerations_items_list_cnt):
         <di:waypoint x="450" y="177" />
         <di:waypoint x="520" y="177" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1igx0a1_di" bpmnElement="Flow_1igx0a1">
-        <di:waypoint x="1290" y="177" />
-        <di:waypoint x="1342" y="177" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1sjh867_di" bpmnElement="Flow_1sjh867">
         <di:waypoint x="960" y="177" />
-        <di:waypoint x="1030" y="177" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_03owp8l_di" bpmnElement="Flow_03owp8l">
-        <di:waypoint x="1130" y="177" />
-        <di:waypoint x="1190" y="177" />
+        <di:waypoint x="1020" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1p5fxob_di" bpmnElement="Flow_1p5fxob">
         <di:waypoint x="-70" y="177" />
@@ -181,6 +171,10 @@ for n in range(0, enumerations_items_list_cnt):
         <di:waypoint x="620" y="177" />
         <di:waypoint x="690" y="177" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1bvuyh3_di" bpmnElement="Flow_1bvuyh3">
+        <di:waypoint x="1070" y="217" />
+        <di:waypoint x="1070" y="292" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>