diff --git a/shared/build-enum-list-from-aws/shared-build-enum-list-from-aws.bpmn b/shared/build-enum-list-from-aws/shared-build-enum-list-from-aws.bpmn
index 3a81b961..7df00a56 100644
--- a/shared/build-enum-list-from-aws/shared-build-enum-list-from-aws.bpmn
+++ b/shared/build-enum-list-from-aws/shared-build-enum-list-from-aws.bpmn
@@ -9,7 +9,15 @@
       <bpmn:incoming>Flow_1dc7oe2</bpmn:incoming>
       <bpmn:outgoing>Flow_1lst375</bpmn:outgoing>
       <bpmn:script># Build Enum List from AWS
-enumerations_items_list = enumerations["Items"]</bpmn:script>
+enumerations_items_list = enumerations["Items"]
+
+# Build Enum List
+enumerations_items_list_cnt = enumerations["Count"]
+enumerations_list = []
+enumerations_list.append({'label': 'Add New', 'value': 'add'})
+for n in range(0, enumerations_items_list_cnt):
+    if enumerations_items_list[n]["Subject"] == whichSubject:
+        enumerations_list.append({'label': enumerations_items_list[n]["Label"], 'value': enumerations_items_list[n]["Value"]})</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:endEvent id="Event_0imyhx8">
       <bpmn:incoming>Flow_1lst375</bpmn:incoming>