diff --git a/data/ShopifyServiceJobData.xml b/data/ShopifyServiceJobData.xml
index 8471206..b1f0e05 100644
--- a/data/ShopifyServiceJobData.xml
+++ b/data/ShopifyServiceJobData.xml
@@ -21,6 +21,7 @@ under the License.
     <!-- Enumeration Types for Service Jobs -->
     <moqui.basic.EnumerationType enumTypeId="FULFILLMENT_SYS_JOB" description="Fulfillment Jobs"/>
     <moqui.basic.EnumerationType enumTypeId="MISC_SYS_JOB" description="Miscellaneous Jobs"/>
+    <moqui.basic.EnumerationType enumTypeId="PRODUCT_SYS_JOB" description="Product Jobs"/>
 
     <!-- ServiceJob data to purge old SystemMessage records -->
     <moqui.service.job.ServiceJob jobName="purge_OldSystemMessages" description="Purge Old System Messages"
@@ -232,7 +233,8 @@ under the License.
     </moqui.service.job.ServiceJob>
 
     <!-- ServiceJob data for queuing Created productIds feed -->
-    <moqui.service.job.ServiceJob jobName="queue_CreatedProductIdsFeed" description="Queue created productIds feed"
+    <moqui.basic.Enumeration enumId="QueueCreatedProductsFeed" enumCode="QueueCreatedProductsFeed" description="Queue Created Products Feed" enumTypeId="PRODUCT_SYS_JOB"/>
+    <moqui.service.job.ServiceJob jobName="queue_CreatedProductIdsFeed" description="Queue created productIds feed" jobTypeEnumId="QueueCreatedProductsFeed"
           serviceName="co.hotwax.shopify.system.ShopifySystemMessageServices.queue#FeedSystemMessage" cronExpression="0 0 * * * ?" paused="Y">
         <parameters parameterName="systemMessageTypeId" parameterValue="GenerateCreatedProductIdsFeed"/>
         <parameters parameterName="systemMessageRemoteId" parameterValue=""/>
@@ -240,7 +242,8 @@ under the License.
     </moqui.service.job.ServiceJob>
 
     <!-- ServiceJob data for queuing Updated productIds feed -->
-    <moqui.service.job.ServiceJob jobName="queue_UpdatedProductIdsFeed" description="Queue updated productIds feed"
+    <moqui.basic.Enumeration enumId="QueueUpdatedProductsFeed" enumCode="QueueUpdatedProductsFeed" description="Queue Product Updates Feed" enumTypeId="PRODUCT_SYS_JOB"/>
+    <moqui.service.job.ServiceJob jobName="queue_UpdatedProductIdsFeed" description="Queue updated productIds feed" jobTypeEnumId="QueueUpdatedProductsFeed"
             serviceName="co.hotwax.shopify.system.ShopifySystemMessageServices.queue#FeedSystemMessage" cronExpression="0 0 * * * ?" paused="Y">
         <parameters parameterName="systemMessageTypeId" parameterValue="GenerateUpdatedProductIdsFeed"/>
         <parameters parameterName="systemMessageRemoteId" parameterValue=""/>
diff --git a/data/UpgradeData_v1.3.1.xml b/data/UpgradeData_v1.3.1.xml
index 7e2c9cf..82d9fd3 100644
--- a/data/UpgradeData_v1.3.1.xml
+++ b/data/UpgradeData_v1.3.1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-facade-xml type="ext-upgrade">
+<entity-facade-xml type="ext-upgrade-v1.3.1">
     <!-- SystemMessageType record for importing Gift Card Activation Feed -->
     <moqui.service.message.SystemMessageType systemMessageTypeId="GiftCardActivationFeed"
             description="Create Gift Card Activation Feed System Message"
diff --git a/data/UpgradeData_v1.3.2.xml b/data/UpgradeData_v1.3.2.xml
index cd87eae..cfadafd 100644
--- a/data/UpgradeData_v1.3.2.xml
+++ b/data/UpgradeData_v1.3.2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-facade-xml type="ext-upgrade">
+<entity-facade-xml type="ext-upgrade-v1.3.2">
     <!-- SystemMessageType record for shopify ORDERS_UPDATED webhook -->
     <moqui.service.message.SystemMessageType systemMessageTypeId="OrdersUpdated"
             description="Shopify Orders Updated Webhook"
diff --git a/data/UpgradeData_v1.3.3.xml b/data/UpgradeData_v1.3.3.xml
index adb022a..88e45c6 100644
--- a/data/UpgradeData_v1.3.3.xml
+++ b/data/UpgradeData_v1.3.3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<entity-facade-xml type="ext-upgrade">
+<entity-facade-xml type="ext-upgrade-v1.3.3">
     <!-- SystemMessageType record for bulk order discount code application query to Shopify -->
     <moqui.service.message.SystemMessageType systemMessageTypeId="BulkOrderDiscountCodeApplQuery"
             description="Bulk Order Discount Code Application Query System Message"
diff --git a/data/UpgradeData_v1.3.4.xml b/data/UpgradeData_v1.3.4.xml
index 7c0625c..2166f2c 100644
--- a/data/UpgradeData_v1.3.4.xml
+++ b/data/UpgradeData_v1.3.4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-facade-xml type="seed">
+<entity-facade-xml type="ext-upgrade-v1.3.4">
     <!-- DbResource of Shopify GraphQL Templates-->
     <moqui.resource.DbResource filename="shopify" isFile="N" resourceId="Shopify" parentResourceId=""/>
     <moqui.resource.DbResource filename="template" isFile="N" resourceId="Template" parentResourceId="Shopify"/>
diff --git a/data/UpgradeData_v2.0.0.xml b/data/UpgradeData_v2.0.0.xml
index e402b35..5d314c8 100644
--- a/data/UpgradeData_v2.0.0.xml
+++ b/data/UpgradeData_v2.0.0.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<entity-facade-xml type="ext-upgrade">
+<entity-facade-xml type="ext-upgrade-v2.0.0">
     <moqui.resource.DbResource filename="OrderHeaderByIdQuery.ftl" isFile="Y" resourceId="OrderHeaderByIdQuery" parentResourceId="GraphQL">
         <file mimeType="text/html" versionName="01" rootVersionName="01">
             <fileData>
diff --git a/data/UpgradeData_v2.0.1.xml b/data/UpgradeData_v2.0.1.xml
new file mode 100644
index 0000000..0c2b94e
--- /dev/null
+++ b/data/UpgradeData_v2.0.1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-facade-xml type="ext-upgrade-v2.0.1">
+    <moqui.basic.EnumerationType enumTypeId="PRODUCT_SYS_JOB" description="Product Jobs"/>
+    <moqui.basic.Enumeration enumId="QueueCreatedProductsFeed" enumCode="QueueCreatedProductsFeed" description="Queue Created Products Feed" enumTypeId="PRODUCT_SYS_JOB"/>
+    <moqui.service.job.ServiceJob jobName="queue_CreatedProductIdsFeed" jobTypeEnumId="QueueCreatedProductsFeed"/>
+    <moqui.basic.Enumeration enumId="QueueUpdatedProductsFeed" enumCode="QueueUpdatedProductsFeed" description="Queue Product Updates Feed" enumTypeId="PRODUCT_SYS_JOB"/>
+    <moqui.service.job.ServiceJob jobName="queue_UpdatedProductIdsFeed" jobTypeEnumId="QueueUpdatedProductsFeed"/>
+</entity-facade-xml>
\ No newline at end of file
diff --git a/service/co/hotwax/shopify/system/ShopifySystemMessageServices.xml b/service/co/hotwax/shopify/system/ShopifySystemMessageServices.xml
index 93f7e0a..45babc7 100644
--- a/service/co/hotwax/shopify/system/ShopifySystemMessageServices.xml
+++ b/service/co/hotwax/shopify/system/ShopifySystemMessageServices.xml
@@ -1442,7 +1442,7 @@ under the License.
                 </script>
                 <if condition="relatedSystemMessageType">
                     <service-call name="org.moqui.impl.SystemMessageServices.receive#IncomingSystemMessage" in-map="[systemMessageTypeId:relatedSystemMessageType.systemMessageTypeId, messageText:jsonFilePathRef,
-                              systemMessageRemoteId:systemMessage.systemMessageRemoteId, remoteMessageId:jsonFilePathRef.substring(jsonFilePathRef.lastIndexOf('/')+1)]" transaction="force-new" ignore-error="true"/>
+                              systemMessageRemoteId:systemMessage.systemMessageRemoteId, parentMessageId:systemMessageId, remoteMessageId:jsonFilePathRef.substring(jsonFilePathRef.lastIndexOf('/')+1)]" transaction="force-new" ignore-error="true"/>
                 </if>
                 <set field="hasNextPage" from="createdProductIdsResponse.response.products.pageInfo.hasNextPage"/>
                 <set field="cursor" from="createdProductIdsResponse.response.products.pageInfo.endCursor"/>
@@ -1537,7 +1537,7 @@ under the License.
 
             <if condition="relatedSystemMessageType">
                 <service-call name="org.moqui.impl.SystemMessageServices.queue#SystemMessage"
-                              in-map="[systemMessageTypeId:relatedSystemMessageType.systemMessageTypeId, systemMessageRemoteId:sendSmrId,
+                              in-map="[systemMessageTypeId:relatedSystemMessageType.systemMessageTypeId, systemMessageRemoteId:sendSmrId, parentMessageId:systemMessageId,
                                        messageText:jsonFilePathRef, remoteMessageId: jsonFilePathRef.substring(jsonFilePathRef.lastIndexOf('/')+1), sendNow:true]"
                               out-map="queueSystemMessageOut" ignore-error="true" transaction="force-new"/>
             </if>
@@ -1615,7 +1615,7 @@ under the License.
                 </script>
                 <if condition="relatedSystemMessageType">
                     <service-call name="org.moqui.impl.SystemMessageServices.receive#IncomingSystemMessage" in-map="[systemMessageTypeId:relatedSystemMessageType.systemMessageTypeId, messageText:jsonFilePathRef,
-                              systemMessageRemoteId:systemMessage.systemMessageRemoteId, remoteMessageId:jsonFilePathRef.substring(jsonFilePathRef.lastIndexOf('/')+1)]" transaction="force-new" ignore-error="true"/>
+                              systemMessageRemoteId:systemMessage.systemMessageRemoteId, parentMessageId:systemMessageId, remoteMessageId:jsonFilePathRef.substring(jsonFilePathRef.lastIndexOf('/')+1)]" transaction="force-new" ignore-error="true"/>
                 </if>
                 <set field="hasNextPage" from="updatedProductIdsResponse.response.products.pageInfo.hasNextPage"/>
                 <set field="cursor" from="updatedProductIdsResponse.response.products.pageInfo.endCursor"/>
@@ -1710,7 +1710,7 @@ under the License.
 
             <if condition="relatedSystemMessageType">
                 <service-call name="org.moqui.impl.SystemMessageServices.queue#SystemMessage"
-                              in-map="[systemMessageTypeId:relatedSystemMessageType.systemMessageTypeId, systemMessageRemoteId:sendSmrId,
+                              in-map="[systemMessageTypeId:relatedSystemMessageType.systemMessageTypeId, systemMessageRemoteId:sendSmrId, parentMessageId:systemMessageId,
                                        messageText:jsonFilePathRef, remoteMessageId: jsonFilePathRef.substring(jsonFilePathRef.lastIndexOf('/')+1), sendNow:true]"
                               out-map="queueSystemMessageOut" ignore-error="true" transaction="force-new"/>
             </if>