From d45077d47e9168734f6f943b20f914e0b5efa9c4 Mon Sep 17 00:00:00 2001
From: Afsin Kapusuzoglu <afsin@backbase.com>
Date: Tue, 10 Sep 2024 09:51:29 +0200
Subject: [PATCH] HRMS-1590 - complete oneruntime

---
 .../event-general-notifications.json          |  4 +-
 .../event-general-notifications.json          |  2 +
 .../event-general-notifications.json          |  8 ++-
 .../en_US/engagement-template.json            |  4 ++
 .../in-app_channel-settings.json              |  5 ++
 .../event-general-notifications.json          | 31 ++++++++++
 .../en_US/engagement-template.json            |  4 ++
 .../in-app_channel-settings.json              |  5 ++
 .../event-general-notifications.json          | 31 ++++++++++
 .../assets/email-address-added-template.html  | 30 +++++++++
 .../email/email_channel-settings.json         |  3 +
 .../assets/email-address-added-template.html  | 30 +++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 58 +++++++++++++++++
 .../email-address-deleted-template.html       | 30 +++++++++
 .../email/email_channel-settings.json         |  3 +
 .../email-address-deleted-template.html       | 30 +++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 58 +++++++++++++++++
 .../event-general-notifications.json          | 62 +++++++++++++++++--
 .../en_US/engagement-template.json            |  4 ++
 .../in-app_channel-settings.json              |  5 ++
 .../en_US/engagement-template.json            |  4 ++
 .../in-app_channel-settings.json              |  5 ++
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../assets/password-changed-template.html     | 32 ++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../assets/password-changed-template.html     | 32 ++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../password-reset-failure-template.html      | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../password-reset-failure-template.html      | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../password-reset-success-template.html      | 33 ++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../password-reset-success-template.html      | 33 ++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../assets/phone-number-added-template.html   | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../assets/phone-number-added-template.html   | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../assets/delete-phone-number-template.html  | 29 +++++++++
 .../email/email_channel-settings.json         |  3 +
 .../assets/delete-phone-number-template.html  | 29 +++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../assets/phone-number-updated-template.html | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../assets/phone-number-updated-template.html | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../assets/postal-address-added-template.html | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../assets/postal-address-added-template.html | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../postal-address-deleted-template.html      | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../postal-address-deleted-template.html      | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../postal-address-updated-template.html      | 29 +++++++++
 .../email/email_channel-settings.json         |  3 +
 .../postal-address-updated-template.html      | 29 +++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 45 ++++++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../email/en_US/engagement-template.json      |  4 ++
 .../en_US/engagement-template.json            |  4 ++
 .../in-app_channel-settings.json              |  5 ++
 .../event-general-notifications.json          | 45 ++++++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../email/en_US/engagement-template.json      |  4 ++
 .../en_US/engagement-template.json            |  4 ++
 .../in-app_channel-settings.json              |  5 ++
 .../event-general-notifications.json          | 46 ++++++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../email/en_US/engagement-template.json      |  4 ++
 .../en_US/engagement-template.json            |  4 ++
 .../in-app_channel-settings.json              |  5 ++
 .../event-general-notifications.json          | 46 ++++++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../email/en_US/engagement-template.json      |  4 ++
 .../en_US/engagement-template.json            |  4 ++
 .../in-app_channel-settings.json              |  5 ++
 .../event-general-notifications.json          | 58 +++++++++++++++++
 .../email/assets/update-email-template.html   | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../email/assets/update-email-template.html   | 27 ++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          | 57 +++++++++++++++++
 .../assets/username-changed-template.html     | 33 ++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../assets/username-changed-template.html     | 33 ++++++++++
 .../email/email_channel-settings.json         |  3 +
 .../event-general-notifications.json          |  4 +-
 pom.xml                                       |  2 +-
 101 files changed, 1991 insertions(+), 13 deletions(-)
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/direct-deposit-failed-retail/in-app-notification/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/direct-deposit-failed-retail/in-app-notification/in-app_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/direct-deposit-success-retail/in-app-notification/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/direct-deposit-success-retail/in-app-notification/in-app_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-business/email/assets/email-address-added-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-retail/email/assets/email-address-added-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-added/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-business/email/assets/email-address-deleted-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-retail/email/assets/email-address-deleted-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-business/in-app-notification/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-business/in-app-notification/in-app_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-retail/in-app-notification/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-retail/in-app-notification/in-app_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-changed/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-business/email/assets/password-changed-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-retail/email/assets/password-changed-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-business/email/assets/password-reset-failure-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-retail/email/assets/password-reset-failure-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-business/email/assets/password-reset-success-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-retail/email/assets/password-reset-success-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-business/email/assets/phone-number-added-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-retail/email/assets/phone-number-added-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-business/email/assets/delete-phone-number-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-retail/email/assets/delete-phone-number-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-business/email/assets/phone-number-updated-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-retail/email/assets/phone-number-updated-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-business/email/assets/postal-address-added-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-retail/email/assets/postal-address-added-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-business/email/assets/postal-address-deleted-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-retail/email/assets/postal-address-deleted-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-business/email/assets/postal-address-updated-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-retail/email/assets/postal-address-updated-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/email/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/in-app-notification/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/in-app-notification/in-app_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/email/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/email/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/in-app-notification/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/in-app-notification/in-app_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/email/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/update-email/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-business/email/assets/update-email-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-retail/email/assets/update-email-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-retail/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/username-changed/event-general-notifications.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-business/email/assets/username-changed-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-business/email/email_channel-settings.json
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-retail/email/assets/username-changed-template.html
 create mode 100644 collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-retail/email/email_channel-settings.json

diff --git a/collections/business/general-notifications/event-general-notifications/message-received/event-general-notifications.json b/collections/business/general-notifications/event-general-notifications/message-received/event-general-notifications.json
index 68140b7..f755bf5 100644
--- a/collections/business/general-notifications/event-general-notifications/message-received/event-general-notifications.json
+++ b/collections/business/general-notifications/event-general-notifications/message-received/event-general-notifications.json
@@ -7,7 +7,7 @@
   "generalNotifications": [
     {
       "id": "new-message-received",
-      "name": "New Message Received",
+      "name": "New Message Received From Customer Support",
       "userPreferenceEnabled": false,
       "additionalFilterLogic": "!(#triggeredEvent['origin'] != null && #triggeredEvent['origin'] == 'engagement')",
       "deliveryOptions": [
@@ -49,7 +49,7 @@
     },
     {
       "id": "new-message-received-mailout",
-      "name": "New Message Received Mailout",
+      "name": "New Message Received From Marketer",
       "userPreferenceEnabled": false,
       "additionalFilterLogic": "#triggeredEvent['origin'] != null && #triggeredEvent['origin'] == 'engagement'",
       "deliveryOptions": [
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/device-registered/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/device-registered/event-general-notifications.json
index 36958df..8e555ec 100644
--- a/collections/oneruntime/general-notifications/event-general-notifications/device-registered/event-general-notifications.json
+++ b/collections/oneruntime/general-notifications/event-general-notifications/device-registered/event-general-notifications.json
@@ -10,6 +10,7 @@
       "name": "Device Registered",
       "userPreferenceEnabled": false,
       "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "manageable": false,
       "deliveryOptions": [
         {
           "channel": "email",
@@ -30,6 +31,7 @@
       "name": "Device Registered",
       "userPreferenceEnabled": false,
       "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : false",
+      "manageable": false,
       "deliveryOptions": [
         {
           "channel": "email",
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/device-removed/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/device-removed/event-general-notifications.json
index 8d78f14..37e1b95 100644
--- a/collections/oneruntime/general-notifications/event-general-notifications/device-removed/event-general-notifications.json
+++ b/collections/oneruntime/general-notifications/event-general-notifications/device-removed/event-general-notifications.json
@@ -7,9 +7,10 @@
   "generalNotifications": [
     {
       "id": "device-removed",
-      "name": "Device Removed",
+      "name": "Device Removed Retail",
       "userPreferenceEnabled": false,
       "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "manageable": false,
       "deliveryOptions": [
         {
           "channel": "email",
@@ -27,15 +28,16 @@
     },
     {
       "id": "device-removed-business",
-      "name": "Device Removed",
+      "name": "Device Removed Business",
       "userPreferenceEnabled": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : false",
+      "manageable": false,
       "deliveryOptions": [
         {
           "channel": "email",
           "channelSettings": "/device-removed-business/email/email_channel-settings.json",
           "isEnabledByDefault": true,
           "isManageableByUser": false,
-          "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : false",
           "engagementTemplates": [
             {
               "path": "/device-removed-business/email/en_US/engagement-template.json",
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/direct-deposit-failed-retail/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/direct-deposit-failed-retail/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..f792a4c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/direct-deposit-failed-retail/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "{{{event.inAppNotification.title}}}",
+  "body": "&#128184; {{{event.inAppNotification.body}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/direct-deposit-failed-retail/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/direct-deposit-failed-retail/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..022579b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/direct-deposit-failed-retail/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "ALERT",
+  "targetGroup": "USER",
+  "origin": "Direct Deposit Switch"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/event-general-notifications.json
new file mode 100644
index 0000000..6ffd79f
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-failed/event-general-notifications.json
@@ -0,0 +1,31 @@
+{
+  "eventClassName": "com.backbase.directdepositswitch.event.spec.v1.DirectDepositFailedEvent",
+  "id": "direct-deposit-failed",
+  "eventBusinessName": "Direct Deposit Failed",
+  "recipientType": "internal",
+  "extractor": "#this['internalUserId']",
+  "generalNotifications": [
+    {
+      "id": "direct-deposit-failed",
+      "name": "Direct Deposit Failed",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/direct-deposit-failed-retail/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "path": "/direct-deposit-failed-retail/in-app-notification/en_US/engagement-template.json",
+              "templateName": "direct-deposit-failed-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/direct-deposit-success-retail/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/direct-deposit-success-retail/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..f792a4c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/direct-deposit-success-retail/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "{{{event.inAppNotification.title}}}",
+  "body": "&#128184; {{{event.inAppNotification.body}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/direct-deposit-success-retail/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/direct-deposit-success-retail/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..11ba4da
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/direct-deposit-success-retail/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "SUCCESS",
+  "targetGroup": "USER",
+  "origin": "Direct Deposit Switch"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/event-general-notifications.json
new file mode 100644
index 0000000..d023994
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/direct-deposit-success/event-general-notifications.json
@@ -0,0 +1,31 @@
+{
+  "eventClassName": "com.backbase.directdepositswitch.event.spec.v1.DirectDepositSuccessEvent",
+  "id": "direct-deposit-success",
+  "eventBusinessName": "Direct Deposit Success",
+  "recipientType": "internal",
+  "extractor": "#this['internalUserId']",
+  "generalNotifications": [
+    {
+      "id": "direct-deposit-success",
+      "name": "Direct Deposit Success",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/direct-deposit-success-retail/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "path": "/direct-deposit-success-retail/in-app-notification/en_US/engagement-template.json",
+              "templateName": "direct-deposit-success-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-business/email/assets/email-address-added-template.html b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-business/email/assets/email-address-added-template.html
new file mode 100644
index 0000000..3f42bd2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-business/email/assets/email-address-added-template.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br />
+  <p>A new email address was added to your online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <br />
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <br />
+  <p>Regards,</p>
+  <p>Backbase Business Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-retail/email/assets/email-address-added-template.html b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-retail/email/assets/email-address-added-template.html
new file mode 100644
index 0000000..10f4c13
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-retail/email/assets/email-address-added-template.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br />
+  <p>A new email address was added to your online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <br />
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <br />
+  <p>Regards,</p>
+  <p>Backbase Retail Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/email-address-added-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/event-general-notifications.json
new file mode 100644
index 0000000..9873913
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-added/event-general-notifications.json
@@ -0,0 +1,58 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.AddEmailSecNotEvent",
+  "id": "email-address-added",
+  "eventBusinessName": "Email Address Added",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "emailExtractor": "#triggeredEvent['newPrimaryFlagValue'] ?  new String[] {#triggeredEvent['previousContactEmail'], #triggeredEvent['newEmailValue']}: #triggeredEvent['previousContactEmail']",
+  "generalNotifications": [
+    {
+      "id": "email-address-added",
+      "name": "Email Address Added Retail",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['previousContactEmail'] != null && #lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/email-address-added-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Email address added to online banking",
+                "body": "file:/email-address-added-retail/email/assets/email-address-added-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "email-address-added-business",
+      "name": "Email Address Added Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['previousContactEmail'] != null && #lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/email-address-added-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Email address added to online banking",
+                "body": "file:/email-address-added-business/email/assets/email-address-added-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-business/email/assets/email-address-deleted-template.html b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-business/email/assets/email-address-deleted-template.html
new file mode 100644
index 0000000..4a93064
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-business/email/assets/email-address-deleted-template.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br />
+  <p>Your email address was removed from online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <br />
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your email addresses on online banking are correct.</li>
+    </ul>
+  </ul>
+  <br />
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-business/email/email_channel-settings.json
new file mode 100644
index 0000000..f9e00d2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-retail/email/assets/email-address-deleted-template.html b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-retail/email/assets/email-address-deleted-template.html
new file mode 100644
index 0000000..4a93064
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-retail/email/assets/email-address-deleted-template.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br />
+  <p>Your email address was removed from online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <br />
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your email addresses on online banking are correct.</li>
+    </ul>
+  </ul>
+  <br />
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..f9e00d2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/email-address-deleted-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/event-general-notifications.json
new file mode 100644
index 0000000..bb7e3fa
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/email-address-deleted/event-general-notifications.json
@@ -0,0 +1,58 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.DeleteEmailSecNotEvent",
+  "id": "email-address-deleted",
+  "eventBusinessName": "Email Address Deleted",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "emailExtractor": "#triggeredEvent['previousContactEmail']",
+  "generalNotifications": [
+    {
+      "id": "email-address-deleted",
+      "name": "Email Address Deleted",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['previousContactEmail'] != null && #lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/email-address-deleted-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Email address removed from online banking",
+                "body": "file:/email-address-deleted-retail/email/assets/email-address-deleted-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "email-address-deleted-business",
+      "name": "Email Address Deleted Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['previousContactEmail'] != null && #lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/email-address-deleted-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Email address removed from online banking",
+                "body": "file:/email-address-deleted-business/email/assets/email-address-deleted-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/event-general-notifications.json
index 83cffb7..b174bd3 100644
--- a/collections/oneruntime/general-notifications/event-general-notifications/message-received/event-general-notifications.json
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/event-general-notifications.json
@@ -7,10 +7,10 @@
   "generalNotifications": [
     {
       "id": "new-message-received",
-      "name": "New Message Received Retail",
+      "name": "New Message Received From Customer Support Retail",
       "userPreferenceEnabled": false,
       "manageable": false,
-      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true && !(#triggeredEvent['origin'] != null && #triggeredEvent['origin'] == 'engagement')",
       "deliveryOptions": [
         {
           "channel": "in-app-notification",
@@ -48,12 +48,38 @@
         }
       ]
     },
+    {
+      "id": "new-message-received-mailout",
+      "name": "New Message Received From Marketer Retail",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true && #triggeredEvent['origin'] != null && #triggeredEvent['origin'] == 'engagement'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/new-message-received-mailout-retail/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "conversation-view",
+            "data": "{\"id\":\"{{event.conversationId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-message-received-mailout-retail/in-app-notification/en_US/engagement-template.json",
+              "templateName": "new-message-received-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
     {
       "id": "new-message-received-business",
-      "name": "New Message Received Business",
+      "name": "New Message Received From Customer Support Business",
       "userPreferenceEnabled": false,
       "manageable": false,
-      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true && !(#triggeredEvent['origin'] != null && #triggeredEvent['origin'] == 'engagement')",
       "deliveryOptions": [
         {
           "channel": "in-app-notification",
@@ -90,6 +116,32 @@
           ]
         }
       ]
+    },
+    {
+      "id": "new-message-received-mailout-business",
+      "name": "New Message Received From Marketer Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true && #triggeredEvent['origin'] != null && #triggeredEvent['origin'] == 'engagement'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/new-message-received-mailout-business/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "conversation-view",
+            "data": "{\"id\":\"{{event.conversationId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-message-received-mailout-business/in-app-notification/en_US/engagement-template.json",
+              "templateName": "new-message-received-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-business/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-business/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..096c6dc
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-business/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New message",
+  "body": "From: {{{event.sender}}} <br/>Subject: {{{event.subject}}} <br/>Topic: {{{event.topicName}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-business/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-business/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..b5bc6be
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-business/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "MessageCenter"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-retail/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-retail/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..096c6dc
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-retail/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New message",
+  "body": "From: {{{event.sender}}} <br/>Subject: {{{event.subject}}} <br/>Topic: {{{event.topicName}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-retail/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-retail/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..b5bc6be
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-mailout-retail/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "MessageCenter"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-changed/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/event-general-notifications.json
new file mode 100644
index 0000000..1b236e2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.ChangeOwnPasswordSecNotEvent",
+  "id": "password-changed",
+  "eventBusinessName": "Password Changed",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "password-changed",
+      "name": "Password Changed",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/password-changed-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Password changed",
+                "body": "file:/password-changed-retail/email/assets/password-changed-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "password-changed-business",
+      "name": "Password Changed Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/password-changed-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Password changed",
+                "body": "file:/password-changed-business/email/assets/password-changed-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-business/email/assets/password-changed-template.html b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-business/email/assets/password-changed-template.html
new file mode 100644
index 0000000..85eff2b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-business/email/assets/password-changed-template.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br />
+  <p>Your password was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don’t have to do anything. Use your new password next time you log in.</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away.</li>
+  </ul>
+  <p>Keep these security tips in mind:</p>
+  <ul>
+    <li>Never share your password.</li>
+    <li>Create passwords that are hard to guess.</li>
+    <li>Don't use personal information in your password.</li>
+    <li>Use different passwords for each of your online services.</li>
+  </ul>
+  <br />
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-business/email/email_channel-settings.json
new file mode 100644
index 0000000..f9e00d2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-retail/email/assets/password-changed-template.html b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-retail/email/assets/password-changed-template.html
new file mode 100644
index 0000000..85eff2b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-retail/email/assets/password-changed-template.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br />
+  <p>Your password was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don’t have to do anything. Use your new password next time you log in.</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away.</li>
+  </ul>
+  <p>Keep these security tips in mind:</p>
+  <ul>
+    <li>Never share your password.</li>
+    <li>Create passwords that are hard to guess.</li>
+    <li>Don't use personal information in your password.</li>
+    <li>Use different passwords for each of your online services.</li>
+  </ul>
+  <br />
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..f9e00d2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-changed/password-changed-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/event-general-notifications.json
new file mode 100644
index 0000000..c0c6f92
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.identity.accountrecovery.event.spec.v1.PasswordResetFailureEvent",
+  "id": "password-reset-failure",
+  "eventBusinessName": "Password Reset Failure",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "password-reset-failure",
+      "name": "Password Reset Failure",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/password-reset-failure-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Your password was not changed",
+                "body": "file:/password-reset-failure-retail/email/assets/password-reset-failure-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "password-reset-failure-business",
+      "name": "Password Reset Failure Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/password-reset-failure-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Your password was not changed",
+                "body": "file:/password-reset-failure-business/email/assets/password-reset-failure-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-business/email/assets/password-reset-failure-template.html b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-business/email/assets/password-reset-failure-template.html
new file mode 100644
index 0000000..01c0164
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-business/email/assets/password-reset-failure-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br>
+  <p>There was an attempt to change your password on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this wasn't you, or if you're still having problems changing your password, please contact us.</p>
+  <br>
+  <p>Keep these security tips in mind:</p>
+  <ul>
+    <li>Never share your password.</li>
+    <li>Create passwords that are hard to guess.</li>
+    <li>Don't use personal information in your password.</li>
+    <li>Use different passwords for each of your online services.</li>
+  </ul>
+  <br>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-retail/email/assets/password-reset-failure-template.html b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-retail/email/assets/password-reset-failure-template.html
new file mode 100644
index 0000000..01c0164
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-retail/email/assets/password-reset-failure-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br>
+  <p>There was an attempt to change your password on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this wasn't you, or if you're still having problems changing your password, please contact us.</p>
+  <br>
+  <p>Keep these security tips in mind:</p>
+  <ul>
+    <li>Never share your password.</li>
+    <li>Create passwords that are hard to guess.</li>
+    <li>Don't use personal information in your password.</li>
+    <li>Use different passwords for each of your online services.</li>
+  </ul>
+  <br>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-failure/password-reset-failure-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/event-general-notifications.json
new file mode 100644
index 0000000..a0c3e02
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.identity.accountrecovery.event.spec.v1.PasswordResetSuccessEvent",
+  "id": "password-reset-success",
+  "eventBusinessName": "Password Reset Success",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "password-reset-success",
+      "name": "Password Reset Success",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/password-reset-success-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "You changed your password",
+                "body": "file:/password-reset-success-retail/email/assets/password-reset-success-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "password-reset-success-business",
+      "name": "Password Reset Success Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/password-reset-success-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "You changed your password",
+                "body": "file:/password-reset-success-business/email/assets/password-reset-success-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-business/email/assets/password-reset-success-template.html b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-business/email/assets/password-reset-success-template.html
new file mode 100644
index 0000000..8639d5f
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-business/email/assets/password-reset-success-template.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br>
+  <p>Your password was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything. Use your new password next time you log in.</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away.</li>
+  </ul>
+  <p>Keep these security tips in mind:</p>
+  <ul>
+    <li>Never share your password.</li>
+    <li>Create passwords that are hard to guess.</li>
+    <li>Don't use personal information in your password.</li>
+    <li>Use different passwords for each of your online services.</li>
+  </ul>
+  <br>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-retail/email/assets/password-reset-success-template.html b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-retail/email/assets/password-reset-success-template.html
new file mode 100644
index 0000000..8639d5f
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-retail/email/assets/password-reset-success-template.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br>
+  <p>Your password was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything. Use your new password next time you log in.</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away.</li>
+  </ul>
+  <p>Keep these security tips in mind:</p>
+  <ul>
+    <li>Never share your password.</li>
+    <li>Create passwords that are hard to guess.</li>
+    <li>Don't use personal information in your password.</li>
+    <li>Use different passwords for each of your online services.</li>
+  </ul>
+  <br>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/password-reset-success/password-reset-success-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/event-general-notifications.json
new file mode 100644
index 0000000..6aaede4
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.AddPhoneNumberSecNotEvent",
+  "id": "phone-number-added",
+  "eventBusinessName": "Phone Number Added",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "phone-number-added",
+      "name": "Phone Number Added",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/phone-number-added-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Phone number added to online banking",
+                "body": "file:/phone-number-added-retail/email/assets/phone-number-added-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "phone-number-added-business",
+      "name": "Phone Number Added Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/phone-number-added-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Phone number added to online banking",
+                "body": "file:/phone-number-added-business/email/assets/phone-number-added-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-business/email/assets/phone-number-added-template.html b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-business/email/assets/phone-number-added-template.html
new file mode 100644
index 0000000..45523f2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-business/email/assets/phone-number-added-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>A new phone number was added to your online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-retail/email/assets/phone-number-added-template.html b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-retail/email/assets/phone-number-added-template.html
new file mode 100644
index 0000000..45523f2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-retail/email/assets/phone-number-added-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>A new phone number was added to your online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-added/phone-number-added-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/event-general-notifications.json
new file mode 100644
index 0000000..3560791
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.DeletePhoneNumberSecNotEvent",
+  "id": "phone-number-deleted",
+  "eventBusinessName": "Phone Number Deleted",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "phone-number-deleted",
+      "name": "Phone Number Deleted",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/phone-number-deleted-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+            "content": {
+              "subject": "Phone number removed from online banking",
+              "body": "file:/phone-number-deleted-retail/email/assets/delete-phone-number-template.html"
+            },
+            "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "phone-number-deleted-business",
+      "name": "Phone Number Deleted Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/phone-number-deleted-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Phone number removed from online banking",
+                "body": "file:/phone-number-deleted-business/email/assets/delete-phone-number-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-business/email/assets/delete-phone-number-template.html b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-business/email/assets/delete-phone-number-template.html
new file mode 100644
index 0000000..61c0540
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-business/email/assets/delete-phone-number-template.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br>
+  <p>The phone number you use for online banking was removed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-retail/email/assets/delete-phone-number-template.html b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-retail/email/assets/delete-phone-number-template.html
new file mode 100644
index 0000000..61c0540
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-retail/email/assets/delete-phone-number-template.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br>
+  <p>The phone number you use for online banking was removed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-deleted/phone-number-deleted-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/event-general-notifications.json
new file mode 100644
index 0000000..0883b18
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.UpdatePhoneNumberSecNotEvent",
+  "id": "phone-number-updated",
+  "eventBusinessName": "Phone Number Updated",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "phone-number-updated",
+      "name": "Phone Number Updated",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/phone-number-updated-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Phone number for online banking was changed",
+                "body": "file:/phone-number-updated-retail/email/assets/phone-number-updated-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "phone-number-updated-business",
+      "name": "Phone Number Updated Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/phone-number-updated-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Phone number for online banking was changed",
+                "body": "file:/phone-number-updated-business/email/assets/phone-number-updated-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-business/email/assets/phone-number-updated-template.html b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-business/email/assets/phone-number-updated-template.html
new file mode 100644
index 0000000..4521be8
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-business/email/assets/phone-number-updated-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>Your phone number for online banking was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-retail/email/assets/phone-number-updated-template.html b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-retail/email/assets/phone-number-updated-template.html
new file mode 100644
index 0000000..4521be8
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-retail/email/assets/phone-number-updated-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>Your phone number for online banking was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/phone-number-updated/phone-number-updated-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/event-general-notifications.json
new file mode 100644
index 0000000..41ade89
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.AddPostalAddressSecNotEvent",
+  "id": "postal-address-added",
+  "eventBusinessName": "Postal Address Added",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "postal-address-added",
+      "name": "Postal Address Added",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/postal-address-added-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Mailing address added to online banking",
+                "body": "file:/postal-address-added-retail/email/assets/postal-address-added-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "postal-address-added-business",
+      "name": "Postal Address Added Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/postal-address-added-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Mailing address added to online banking",
+                "body": "file:/postal-address-added-business/email/assets/postal-address-added-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-business/email/assets/postal-address-added-template.html b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-business/email/assets/postal-address-added-template.html
new file mode 100644
index 0000000..69f74b6
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-business/email/assets/postal-address-added-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>A new mailing address was added to your online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Remove the mailing address from your online banking.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-retail/email/assets/postal-address-added-template.html b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-retail/email/assets/postal-address-added-template.html
new file mode 100644
index 0000000..69f74b6
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-retail/email/assets/postal-address-added-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>A new mailing address was added to your online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Remove the mailing address from your online banking.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-added/postal-address-added-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/event-general-notifications.json
new file mode 100644
index 0000000..9a08cdf
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.DeletePostalAddressSecNotEvent",
+  "id": "postal-address-deleted",
+  "eventBusinessName": "Postal Address Deleted",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "postal-address-deleted",
+      "name": "Postal Address Deleted",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/postal-address-deleted-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Mailing address removed from online banking",
+                "body": "file:/postal-address-deleted-retail/email/assets/postal-address-deleted-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "postal-address-deleted-business",
+      "name": "Postal Address Deleted Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/postal-address-deleted-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Mailing address removed from online banking",
+                "body": "file:/postal-address-deleted-business/email/assets/postal-address-deleted-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-business/email/assets/postal-address-deleted-template.html b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-business/email/assets/postal-address-deleted-template.html
new file mode 100644
index 0000000..bb1829a
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-business/email/assets/postal-address-deleted-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>Your mailing address was removed from online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your mailing addresses on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-retail/email/assets/postal-address-deleted-template.html b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-retail/email/assets/postal-address-deleted-template.html
new file mode 100644
index 0000000..bb1829a
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-retail/email/assets/postal-address-deleted-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>Your mailing address was removed from online banking on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your mailing addresses on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-deleted/postal-address-deleted-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/event-general-notifications.json
new file mode 100644
index 0000000..9901da0
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.UpdatePostalAddressSecNotEvent",
+  "id": "postal-address-updated",
+  "eventBusinessName": "Postal Address Updated",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "postal-address-updated",
+      "name": "Postal Address Updated",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/postal-address-updated-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Mailing address for online banking was changed",
+                "body": "file:/postal-address-updated-retail/email/assets/postal-address-updated-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "postal-address-updated-business",
+      "name": "Postal Address Updated Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/postal-address-updated-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Mailing address for online banking was changed",
+                "body": "file:/postal-address-updated-business/email/assets/postal-address-updated-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-business/email/assets/postal-address-updated-template.html b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-business/email/assets/postal-address-updated-template.html
new file mode 100644
index 0000000..3ecbe3f
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-business/email/assets/postal-address-updated-template.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{user.preferredName}}},</p>
+  <br>
+  <p>Your mailing address for online banking was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-retail/email/assets/postal-address-updated-template.html b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-retail/email/assets/postal-address-updated-template.html
new file mode 100644
index 0000000..3ecbe3f
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-retail/email/assets/postal-address-updated-template.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{user.preferredName}}},</p>
+  <br>
+  <p>Your mailing address for online banking was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your phone numbers on online banking are correct.</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/postal-address-updated/postal-address-updated-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/event-general-notifications.json
new file mode 100644
index 0000000..422cb0d
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/event-general-notifications.json
@@ -0,0 +1,45 @@
+{
+  "eventClassName": "com.backbase.positivepay.event.spec.v1.PpAchExceptionsCreatedEvent",
+  "id": "pp-ach-exceptions-created",
+  "eventBusinessName": "Positive Pay ACH Exceptions Created",
+  "recipientType": "subscription",
+  "extractor": "#this['arrangementId']",
+  "subscriptionType": "arrangement",
+  "generalNotifications": [
+    {
+      "id": "pp-ach-exceptions-created-business",
+      "name": "Positive Pay ACH Exceptions Created Business",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "pp-ach-exceptions-created-business/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "positive-pay-ach-active-exceptions-view",
+            "data": ""
+          },
+          "engagementTemplates": [
+            {
+              "path": "/pp-ach-exceptions-created-business/in-app-notification/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "email",
+          "channelSettings": "pp-ach-exceptions-created-business/email/email_channel-settings.json",
+          "isEnabledByDefault": false,
+          "engagementTemplates": [
+            {
+              "path": "/pp-ach-exceptions-created-business/email/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/email/email_channel-settings.json
new file mode 100644
index 0000000..ba1e39e
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "engage-qa@backbase.com"
+}
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/email/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/email/en_US/engagement-template.json
new file mode 100644
index 0000000..98e1a72
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/email/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "subject": "New ACH exceptions to review",
+  "body": "Dear {{{user.preferredName}}} {{{user.familyName}}},\n\nYou have new ACH exceptions to review before the cut-off time on {{{event.cutOffTime}}}. If you do not review them before this cut-off time, they will be {{#eq event.defaultDecision 'PAY' }}paid{{else}}rejected{{/eq}}.\n\nTo review your exceptions:\n\t* Log in to Backbase\n\t* Go to ACH Positive Pay\n\t* Click Exceptions-Active\n\nIf you have any questions about this email, please contact [contact details].\n\n\nRegards,\n[Responsible Dept name]"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..7037162
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "ACH exception(s) to resolve",
+  "body": "You have new exception(s) to pay or reject."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..d94a71b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-exceptions-created/pp-ach-exceptions-created-business/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "SUCCESS",
+  "targetGroup": "USER",
+  "origin": "PositivePayACH"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/event-general-notifications.json
new file mode 100644
index 0000000..8be95b8
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/event-general-notifications.json
@@ -0,0 +1,45 @@
+{
+  "eventClassName": "com.backbase.positivepay.event.spec.v1.PpAchUpcomingCutOffTimeEvent",
+  "id": "pp-ach-upcoming-cut-off-time",
+  "eventBusinessName": "Positive Pay ACH Upcoming cut-off time",
+  "recipientType": "subscription",
+  "extractor": "#this['arrangementId']",
+  "subscriptionType": "arrangement",
+  "generalNotifications": [
+    {
+      "id": "pp-ach-upcoming-cut-off-time-business",
+      "name": "Positive Pay ACH Upcoming Cut-Off Time Business",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "pp-ach-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "positive-pay-ach-active-exceptions-view",
+            "data": ""
+          },
+          "engagementTemplates": [
+            {
+              "path": "/pp-ach-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "email",
+          "channelSettings": "pp-ach-upcoming-cut-off-time-business/email/email_channel-settings.json",
+          "isEnabledByDefault": false,
+          "engagementTemplates": [
+            {
+              "path": "/pp-ach-upcoming-cut-off-time-business/email/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/email/email_channel-settings.json
new file mode 100644
index 0000000..f85250b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "engage-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/email/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/email/en_US/engagement-template.json
new file mode 100644
index 0000000..1d1de4d
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/email/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "subject": "Review ACH exceptions by {{{event.cutOffTime}}} today",
+  "body": "Dear {{{user.preferredName}}} {{{user.familyName}}},\n\nYou have exceptions that need to be reviewed by {{{event.cutOffTime}}} today.\n\nIf you do not review them before this cut-off time, they will be {{#eq event.defaultDecision 'PAY' }}paid{{else}}rejected{{/eq}}.\n\nTo review your exceptions:\n\n\t* Log in to Backbase\n\t* Go to ACH Positive Pay\n\t* Click Exceptions-Active\n\nIf you have any questions about this email, please contact [contact details].\n\nRegards,\n\n[Responsible Dept name]"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..30ccb29
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Pending ACH exceptions",
+  "body": "You have active exceptions to pay or reject before default system decision at {{{event.cutOffTime}}}."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..771771c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-ach-upcoming-cut-off-time/pp-ach-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "PositivePayACH"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/event-general-notifications.json
new file mode 100644
index 0000000..c7d2c5e
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/event-general-notifications.json
@@ -0,0 +1,46 @@
+{
+  "eventClassName": "com.backbase.positivepay.event.spec.v1.PpCheckExceptionsCreatedEvent",
+  "id": "pp-check-exceptions-created",
+  "eventBusinessName": "Positive Pay Check Exceptions Created",
+  "recipientType": "subscription",
+  "extractor": "#this['arrangementId']",
+  "subscriptionType": "arrangement",
+  "generalNotifications": [
+    {
+      "id": "pp-check-exceptions-created-business",
+      "name": "Positive Pay Check Exceptions Created Business",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "pp-check-exceptions-created-business/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "positive-pay-check-active-exceptions-view",
+            "data": ""
+          },
+          "engagementTemplates": [
+            {
+              "path": "/pp-check-exceptions-created-business/in-app-notification/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "email",
+          "channelSettings": "pp-check-exceptions-created-business/email/email_channel-settings.json",
+          "isEnabledByDefault": false,
+          "engagementTemplates": [
+            {
+              "path": "/pp-check-exceptions-created-business/email/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/email/email_channel-settings.json
new file mode 100644
index 0000000..12b303c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+    "from": "engage-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/email/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/email/en_US/engagement-template.json
new file mode 100644
index 0000000..ab3a5c1
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/email/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+    "subject": "New Check Positive Pay exceptions to review",
+    "body": "Dear {{{user.preferredName}}} {{{user.familyName}}},\n\nYou have new exceptions to review before the cut-off time on {{{event.cutOffTime}}}.\n\nIf you do not review them before this cut-off time, they will be {{#eq event.defaultDecision 'PAY' }}paid{{else}}rejected{{/eq}}.\n\nTo review your exceptions:\n\t* Log in to Backbase\n\t* Go to Check Positive Pay\n\t* Click Exceptions-Active\n\nIf you have any questions about this email, please contact [contact details].\n\n\nRegards,\n[Responsible Dept name]"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..47f2ce1
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Check exception(s) to resolve",
+  "body": "You have new exception(s) to pay or reject."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..9afab2d
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-exceptions-created/pp-check-exceptions-created-business/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "SUCCESS",
+  "targetGroup": "USER",
+  "origin": "PositivePayChecks"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/event-general-notifications.json
new file mode 100644
index 0000000..eff0094
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/event-general-notifications.json
@@ -0,0 +1,46 @@
+{
+  "eventClassName": "com.backbase.positivepay.event.spec.v1.PpCheckUpcomingCutOffTimeEvent",
+  "id": "pp-check-upcoming-cut-off-time",
+  "eventBusinessName": "Positive Pay Check Upcoming cut-off time",
+  "recipientType": "subscription",
+  "extractor": "#this['arrangementId']",
+  "subscriptionType": "arrangement",
+  "generalNotifications": [
+    {
+      "id": "pp-check-upcoming-cut-off-time-business",
+      "name": "Positive Pay Check Upcoming Cut-Off Time Business",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "pp-check-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "positive-pay-check-active-exceptions-view",
+            "data": ""
+          },
+          "engagementTemplates": [
+            {
+              "path": "/pp-check-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "email",
+          "channelSettings": "pp-check-upcoming-cut-off-time-business/email/email_channel-settings.json",
+          "isEnabledByDefault": false,
+          "engagementTemplates": [
+            {
+              "path": "/pp-check-upcoming-cut-off-time-business/email/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/email/email_channel-settings.json
new file mode 100644
index 0000000..12b303c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+    "from": "engage-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/email/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/email/en_US/engagement-template.json
new file mode 100644
index 0000000..2feb5d3
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/email/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+    "subject": "Review Check Positive Pay exceptions by {{{event.cutOffTime}}} today",
+    "body": "Dear {{{user.preferredName}}} {{{user.familyName}}},\n\nYou have new exceptions that need to be reviewed by {{{event.cutOffTime}}} today.\n\nIf you do not review them before this cut-off time, they will be {{#eq event.defaultDecision 'PAY' }}paid{{else}}rejected{{/eq}}.\n\nTo review your exceptions:\n\n\t* Log in to Backbase\n\t* Go to Check Positive Pay\n\t* Click Exceptions-Active\n\nIf you have any questions about this email, please contact [contact details].\n\nRegards,\n\n[Responsible Dept name]"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..78f83a4
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Pending Check exceptions",
+  "body": "You have active exceptions to pay or reject before default system decision at {{{event.cutOffTime}}}."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..2c85b91
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pp-check-upcoming-cut-off-time/pp-check-upcoming-cut-off-time-business/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "PositivePayChecks"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/update-email/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/update-email/event-general-notifications.json
new file mode 100644
index 0000000..b825a38
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/update-email/event-general-notifications.json
@@ -0,0 +1,58 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.UpdateEmailSecNotEvent",
+  "id": "update-email-address",
+  "eventBusinessName": "Update Email Address",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "emailExtractor": "!#triggeredEvent['newPrimaryFlagValue'] && !#triggeredEvent['previousPrimaryFlagValue'] ?  #triggeredEvent['primaryEmail'] : new String[] {#triggeredEvent['primaryEmail'], #triggeredEvent['newValue']}",
+  "generalNotifications": [
+    {
+      "id": "update-email-address",
+      "name": "Update Email Address",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['primaryEmail'] != null && #lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/update-email-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Email address for online banking was changed",
+                "body": "file:/update-email-retail/email/assets/update-email-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "update-email-address-business",
+      "name": "Update Email Address Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['primaryEmail'] != null && #lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/update-email-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "Email address for online banking was changed",
+                "body": "file:/update-email-business/email/assets/update-email-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-business/email/assets/update-email-template.html b/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-business/email/assets/update-email-template.html
new file mode 100644
index 0000000..70f5cc3
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-business/email/assets/update-email-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>Your email address for online banking was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything.</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your email addresses on online banking are correct</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-retail/email/assets/update-email-template.html b/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-retail/email/assets/update-email-template.html
new file mode 100644
index 0000000..70f5cc3
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-retail/email/assets/update-email-template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <p>Your email address for online banking was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything.</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away. You should also:</li>
+    <ul>
+      <li>Change your password, and check your online banking for activity.</li>
+      <li>Make sure your email addresses on online banking are correct</li>
+    </ul>
+  </ul>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/update-email/update-email-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/username-changed/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/event-general-notifications.json
new file mode 100644
index 0000000..12c943d
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/event-general-notifications.json
@@ -0,0 +1,57 @@
+{
+  "eventClassName": "com.backbase.dbs.user.manager.event.spec.v2.ChangeUsernameSecNotEvent",
+  "id": "username-changed",
+  "eventBusinessName": "Username Changed",
+  "recipientType": "internal",
+  "extractor": "#this['userInternalId']",
+  "generalNotifications": [
+    {
+      "id": "username-changed",
+      "name": "Username Changed",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/username-changed-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "You changed your username",
+                "body": "file:/username-changed-retail/email/assets/username-changed-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "username-changed-business",
+      "name": "Username Changed Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "email",
+          "channelSettings": "/username-changed-business/email/email_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "content": {
+                "subject": "You changed your username",
+                "body": "file:/username-changed-business/email/assets/username-changed-template.html"
+              },
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-business/email/assets/username-changed-template.html b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-business/email/assets/username-changed-template.html
new file mode 100644
index 0000000..59bd43d
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-business/email/assets/username-changed-template.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br>
+  <p>Your username was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything. Use your new username next time you log in.</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away.</li>
+  </ul>
+  <p>Keep these security tips in mind:</p>
+  <ul>
+    <li>Never share your username or password.</li>
+    <li>Create passwords that are hard to guess.</li>
+    <li>Don't use personal information in your password.</li>
+    <li>Use different passwords for each of your online services.</li>
+  </ul>
+  <br>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-business/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-retail/email/assets/username-changed-template.html b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-retail/email/assets/username-changed-template.html
new file mode 100644
index 0000000..59bd43d
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-retail/email/assets/username-changed-template.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+<div>
+  <p>Dear {{{ user.preferredName }}},</p>
+  <br>
+  <p>Your username was changed on {{ formatDate event.dateTime 'MMMM d yyyy \'at\' HH:mm:ss z' 'en' 'US/Eastern' }}.</p>
+  <br>
+  <p>If this was you:</p>
+  <ul>
+    <li>You don't have to do anything. Use your new username next time you log in.</li>
+  </ul>
+  <p>If this wasn't you:</p>
+  <ul>
+    <li>Contact us right away.</li>
+  </ul>
+  <p>Keep these security tips in mind:</p>
+  <ul>
+    <li>Never share your username or password.</li>
+    <li>Create passwords that are hard to guess.</li>
+    <li>Don't use personal information in your password.</li>
+    <li>Use different passwords for each of your online services.</li>
+  </ul>
+  <br>
+  <p>Regards,</p>
+  <p>Backbase Bank</p>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..bc1b3fd
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/username-changed/username-changed-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+  "from": "identity-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/retail/general-notifications/event-general-notifications/message-received/event-general-notifications.json b/collections/retail/general-notifications/event-general-notifications/message-received/event-general-notifications.json
index 68140b7..f755bf5 100644
--- a/collections/retail/general-notifications/event-general-notifications/message-received/event-general-notifications.json
+++ b/collections/retail/general-notifications/event-general-notifications/message-received/event-general-notifications.json
@@ -7,7 +7,7 @@
   "generalNotifications": [
     {
       "id": "new-message-received",
-      "name": "New Message Received",
+      "name": "New Message Received From Customer Support",
       "userPreferenceEnabled": false,
       "additionalFilterLogic": "!(#triggeredEvent['origin'] != null && #triggeredEvent['origin'] == 'engagement')",
       "deliveryOptions": [
@@ -49,7 +49,7 @@
     },
     {
       "id": "new-message-received-mailout",
-      "name": "New Message Received Mailout",
+      "name": "New Message Received From Marketer",
       "userPreferenceEnabled": false,
       "additionalFilterLogic": "#triggeredEvent['origin'] != null && #triggeredEvent['origin'] == 'engagement'",
       "deliveryOptions": [
diff --git a/pom.xml b/pom.xml
index c41de27..f1c5bbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <name>Backbase :: Engagement Data</name>
 
     <properties>
-        <backbase-bom.version>2024.08</backbase-bom.version>
+        <backbase-bom.version>2024.09-LTS</backbase-bom.version>
         <docker.repo.url>ecr.backbase.com/development</docker.repo.url>
         <gitflow-maven-plugin.version>1.17.0</gitflow-maven-plugin.version>
         <docker-maven-plugin.version>0.40.2</docker-maven-plugin.version>