diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index e3f96a44..56fef507 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -23,7 +23,9 @@ jobs:
           installation_id: 22958780
 
       - name: Backport
-        uses: VachaShah/backport@v1.1.4
+        uses: VachaShah/backport@v2.2.0
         with:
           github_token: ${{ steps.github_app_token.outputs.token }}
           branch_name: backport/backport-${{ github.event.number }}
+          labels_template: "<%= JSON.stringify([...labels, 'autocut']) %>"
+          failure_labels: "failed backport"
diff --git a/build.gradle b/build.gradle
index 03d2d5a8..12936ba9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
-        kotlin_version = System.getProperty("kotlin.version", "1.6.10")
+        kotlin_version = System.getProperty("kotlin.version", "1.8.21")
     }
 
     repositories {
@@ -114,7 +114,7 @@ spotless {
     buildUponDefaultConfig = true
 }*/
 
-task ktlint(type: JavaExec, group: "verification") {
+tasks.register('ktlint', JavaExec) {
     description = "Check Kotlin code style."
     main = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
@@ -126,10 +126,12 @@ task ktlint(type: JavaExec, group: "verification") {
 
 check.dependsOn ktlint
 
-task ktlintFormat(type: JavaExec, group: "formatting") {
+tasks.register('ktlintFormat', JavaExec) {
     description = "Fix Kotlin code style deviations."
-    main = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
+    // https://github.com/pinterest/ktlint/issues/1391#issuecomment-1251287020
+    jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
+    setProperty("mainClass", "com.pinterest.ktlint.Main")
     args "-F", "src/**/*.kt"
 }
 
diff --git a/release-notes/opensearch-common-utils.release-notes-2.9.0.0.md b/release-notes/opensearch-common-utils.release-notes-2.9.0.0.md
new file mode 100644
index 00000000..c5f78503
--- /dev/null
+++ b/release-notes/opensearch-common-utils.release-notes-2.9.0.0.md
@@ -0,0 +1,26 @@
+## Version 2.9.0.0 2023-07-11
+
+Compatible with OpenSearch 2.9.0
+
+### Maintenance
+* Increment version to 2.9.0-SNAPSHOT. ([#444](https://github.com/opensearch-project/common-utils/pull/444))
+* Modify triggers to push snapshots on all branches. ([#454](https://github.com/opensearch-project/common-utils/pull/454))
+
+### Feature
+* Adds Chained alerts triggers for workflows. ([#456](https://github.com/opensearch-project/common-utils/pull/456))
+* Acknowledge chained alert request for workflow. ([#459](https://github.com/opensearch-project/common-utils/pull/459))
+* Adds audit state in Alert. ([#461](https://github.com/opensearch-project/common-utils/pull/461))
+* Add workflowId field in alert. (([#463](https://github.com/opensearch-project/common-utils/pull/463))
+* APIs for get workflow alerts and acknowledge chained alerts. ([#472](https://github.com/opensearch-project/common-utils/pull/472))
+* Add auditDelegateMonitorAlerts flag. ([#476](https://github.com/opensearch-project/common-utils/pull/476))
+* Implemented support for configuring a cluster metrics monitor to call cat/indices, and cat/shards. ([#479](https://github.com/opensearch-project/common-utils/pull/479))
+
+
+### Bug Fixes
+* OpenSearch commons strings library dependency import. ([#474](https://github.com/opensearch-project/common-utils/pull/474))
+
+### Refactoring
+* Pass workflow id in alert constructors. ([#465](https://github.com/opensearch-project/common-utils/pull/465))
+
+### Documentation
+* Added 2.9 release notes. ([#482](https://github.com/opensearch-project/common-utils/pull/482))
\ No newline at end of file
diff --git a/src/main/java/org/opensearch/commons/ConfigConstants.java b/src/main/java/org/opensearch/commons/ConfigConstants.java
index d10dd005..2fcf9dae 100644
--- a/src/main/java/org/opensearch/commons/ConfigConstants.java
+++ b/src/main/java/org/opensearch/commons/ConfigConstants.java
@@ -6,8 +6,8 @@
 package org.opensearch.commons;
 
 import org.opensearch.common.settings.SecureSetting;
-import org.opensearch.common.settings.SecureString;
 import org.opensearch.common.settings.Setting;
+import org.opensearch.core.common.settings.SecureString;
 
 public class ConfigConstants {
 
diff --git a/src/main/java/org/opensearch/commons/authuser/User.java b/src/main/java/org/opensearch/commons/authuser/User.java
index de8a66a6..79242559 100644
--- a/src/main/java/org/opensearch/commons/authuser/User.java
+++ b/src/main/java/org/opensearch/commons/authuser/User.java
@@ -5,7 +5,7 @@
 
 package org.opensearch.commons.authuser;
 
-import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
+import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,12 +19,12 @@
 import org.opensearch.client.Response;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.inject.internal.ToStringBuilder;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java
index f08d33b2..ab274c54 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacyBaseMessage.java
@@ -11,10 +11,10 @@
 import java.util.Map;
 
 import org.apache.hc.core5.net.URIBuilder;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 
 /**
  * This class holds the generic parameters required for a
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java
index 52e18903..cbdadb65 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacyChimeMessage.java
@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 /**
  * This class holds the contents of an Chime message
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java
index 077d901e..874a583a 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessage.java
@@ -12,9 +12,9 @@
 import org.apache.hc.client5.http.classic.methods.HttpPatch;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.classic.methods.HttpPut;
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 /**
  * This class holds the content of an CustomWebhook message
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java
index 480ae76b..b0fbc7ec 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacyEmailMessage.java
@@ -9,10 +9,10 @@
 import java.net.URI;
 import java.util.List;
 
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.commons.notifications.model.MethodType;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 /**
  * This class holds the content of an CustomWebhook message
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java
index afef192c..8fc7a554 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacySNSMessage.java
@@ -7,10 +7,10 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.commons.destination.util.Util;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 /**
  * This class holds the content of an SNS message
diff --git a/src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java b/src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java
index b42bd87e..48cc842a 100644
--- a/src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java
+++ b/src/main/java/org/opensearch/commons/destination/message/LegacySlackMessage.java
@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 /**
  * This class holds the content of an Slack message
diff --git a/src/main/java/org/opensearch/commons/destination/response/LegacyBaseResponse.java b/src/main/java/org/opensearch/commons/destination/response/LegacyBaseResponse.java
index 4d34b67f..218cb89a 100644
--- a/src/main/java/org/opensearch/commons/destination/response/LegacyBaseResponse.java
+++ b/src/main/java/org/opensearch/commons/destination/response/LegacyBaseResponse.java
@@ -7,9 +7,9 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.Writeable;
 
 /**
  * This class holds the generic response attributes
diff --git a/src/main/java/org/opensearch/commons/destination/response/LegacyDestinationResponse.java b/src/main/java/org/opensearch/commons/destination/response/LegacyDestinationResponse.java
index d55f5f3d..fd6467f6 100644
--- a/src/main/java/org/opensearch/commons/destination/response/LegacyDestinationResponse.java
+++ b/src/main/java/org/opensearch/commons/destination/response/LegacyDestinationResponse.java
@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamOutput;
 
 /**
  * This class is a place holder for destination response metadata
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/AlertingPluginInterface.kt b/src/main/kotlin/org/opensearch/commons/alerting/AlertingPluginInterface.kt
index eafe8e69..c905d2b3 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/AlertingPluginInterface.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/AlertingPluginInterface.kt
@@ -7,10 +7,9 @@ package org.opensearch.commons.alerting
 import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionResponse
 import org.opensearch.client.node.NodeClient
-import org.opensearch.common.io.stream.NamedWriteableRegistry
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.commons.alerting.action.AcknowledgeAlertRequest
 import org.opensearch.commons.alerting.action.AcknowledgeAlertResponse
+import org.opensearch.commons.alerting.action.AcknowledgeChainedAlertRequest
 import org.opensearch.commons.alerting.action.AlertingActions
 import org.opensearch.commons.alerting.action.DeleteMonitorRequest
 import org.opensearch.commons.alerting.action.DeleteMonitorResponse
@@ -20,6 +19,8 @@ import org.opensearch.commons.alerting.action.GetAlertsRequest
 import org.opensearch.commons.alerting.action.GetAlertsResponse
 import org.opensearch.commons.alerting.action.GetFindingsRequest
 import org.opensearch.commons.alerting.action.GetFindingsResponse
+import org.opensearch.commons.alerting.action.GetWorkflowAlertsRequest
+import org.opensearch.commons.alerting.action.GetWorkflowAlertsResponse
 import org.opensearch.commons.alerting.action.GetWorkflowRequest
 import org.opensearch.commons.alerting.action.GetWorkflowResponse
 import org.opensearch.commons.alerting.action.IndexMonitorRequest
@@ -30,6 +31,8 @@ import org.opensearch.commons.alerting.action.PublishFindingsRequest
 import org.opensearch.commons.alerting.action.SubscribeFindingsResponse
 import org.opensearch.commons.notifications.action.BaseResponse
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry
+import org.opensearch.core.common.io.stream.Writeable
 
 /**
  * All the transport action plugin interfaces for the Alerting plugin
@@ -147,6 +150,30 @@ object AlertingPluginInterface {
         )
     }
 
+    /**
+     * Get Workflow Alerts interface.
+     * @param client Node client for making transport action
+     * @param request The request object
+     * @param listener The listener for getting response
+     */
+    fun getWorkflowAlerts(
+        client: NodeClient,
+        request: GetWorkflowAlertsRequest,
+        listener: ActionListener<GetWorkflowAlertsResponse>
+    ) {
+        client.execute(
+            AlertingActions.GET_WORKFLOW_ALERTS_ACTION_TYPE,
+            request,
+            wrapActionListener(listener) { response ->
+                recreateObject(response) {
+                    GetWorkflowAlertsResponse(
+                        it
+                    )
+                }
+            }
+        )
+    }
+
     /**
      * Get Workflow interface.
      * @param client Node client for making transport action
@@ -237,6 +264,30 @@ object AlertingPluginInterface {
         )
     }
 
+    /**
+     * Acknowledge Chained Alerts interface.
+     * @param client Node client for making transport action
+     * @param request The request object
+     * @param listener The listener for getting response
+     */
+    fun acknowledgeChainedAlerts(
+        client: NodeClient,
+        request: AcknowledgeChainedAlertRequest,
+        listener: ActionListener<AcknowledgeAlertResponse>
+    ) {
+        client.execute(
+            AlertingActions.ACKNOWLEDGE_CHAINED_ALERTS_ACTION_TYPE,
+            request,
+            wrapActionListener(listener) { response ->
+                recreateObject(response) {
+                    AcknowledgeAlertResponse(
+                        it
+                    )
+                }
+            }
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     private fun <Response : BaseResponse> wrapActionListener(
         listener: ActionListener<Response>,
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequest.kt
index 2576458e..01f3fdd2 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequest.kt
@@ -8,8 +8,8 @@ package org.opensearch.commons.alerting.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.support.WriteRequest
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import java.io.IOException
 import java.util.Collections
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponse.kt
index 2198574d..53fc2f21 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponse.kt
@@ -4,10 +4,10 @@
  */
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Alert
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import java.io.IOException
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequest.kt
index a89c6332..2c482f26 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequest.kt
@@ -7,8 +7,8 @@ package org.opensearch.commons.alerting.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import java.io.IOException
 import java.util.Collections
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/AlertingActions.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/AlertingActions.kt
index f0535af7..c2bae396 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/AlertingActions.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/AlertingActions.kt
@@ -10,22 +10,30 @@ object AlertingActions {
     const val INDEX_MONITOR_ACTION_NAME = "cluster:admin/opendistro/alerting/monitor/write"
     const val INDEX_WORKFLOW_ACTION_NAME = "cluster:admin/opensearch/alerting/workflow/write"
     const val GET_ALERTS_ACTION_NAME = "cluster:admin/opendistro/alerting/alerts/get"
+    const val GET_WORKFLOW_ALERTS_ACTION_NAME = "cluster:admin/opensearch/alerting/workflow_alerts/get"
     const val GET_WORKFLOW_ACTION_NAME = "cluster:admin/opensearch/alerting/workflow/get"
     const val DELETE_MONITOR_ACTION_NAME = "cluster:admin/opendistro/alerting/monitor/delete"
     const val DELETE_WORKFLOW_ACTION_NAME = "cluster:admin/opensearch/alerting/workflow/delete"
     const val GET_FINDINGS_ACTION_NAME = "cluster:admin/opensearch/alerting/findings/get"
     const val ACKNOWLEDGE_ALERTS_ACTION_NAME = "cluster:admin/opendistro/alerting/alerts/ack"
+    const val ACKNOWLEDGE_CHAINED_ALERTS_ACTION_NAME = "cluster:admin/opendistro/alerting/chained_alerts/ack"
     const val SUBSCRIBE_FINDINGS_ACTION_NAME = "cluster:admin/opensearch/alerting/findings/subscribe"
 
     @JvmField
     val INDEX_MONITOR_ACTION_TYPE =
         ActionType(INDEX_MONITOR_ACTION_NAME, ::IndexMonitorResponse)
+
     @JvmField
     val INDEX_WORKFLOW_ACTION_TYPE =
         ActionType(INDEX_WORKFLOW_ACTION_NAME, ::IndexWorkflowResponse)
     @JvmField
     val GET_ALERTS_ACTION_TYPE =
         ActionType(GET_ALERTS_ACTION_NAME, ::GetAlertsResponse)
+
+    @JvmField
+    val GET_WORKFLOW_ALERTS_ACTION_TYPE =
+        ActionType(GET_WORKFLOW_ALERTS_ACTION_NAME, ::GetWorkflowAlertsResponse)
+
     @JvmField
     val GET_WORKFLOW_ACTION_TYPE =
         ActionType(GET_WORKFLOW_ACTION_NAME, ::GetWorkflowResponse)
@@ -33,16 +41,23 @@ object AlertingActions {
     @JvmField
     val DELETE_MONITOR_ACTION_TYPE =
         ActionType(DELETE_MONITOR_ACTION_NAME, ::DeleteMonitorResponse)
+
     @JvmField
     val DELETE_WORKFLOW_ACTION_TYPE =
         ActionType(DELETE_WORKFLOW_ACTION_NAME, ::DeleteWorkflowResponse)
     @JvmField
     val GET_FINDINGS_ACTION_TYPE =
         ActionType(GET_FINDINGS_ACTION_NAME, ::GetFindingsResponse)
+
     @JvmField
     val ACKNOWLEDGE_ALERTS_ACTION_TYPE =
         ActionType(ACKNOWLEDGE_ALERTS_ACTION_NAME, ::AcknowledgeAlertResponse)
+
     @JvmField
     val SUBSCRIBE_FINDINGS_ACTION_TYPE =
         ActionType(SUBSCRIBE_FINDINGS_ACTION_NAME, ::SubscribeFindingsResponse)
+
+    @JvmField
+    val ACKNOWLEDGE_CHAINED_ALERTS_ACTION_TYPE =
+        ActionType(ACKNOWLEDGE_CHAINED_ALERTS_ACTION_NAME, ::AcknowledgeAlertResponse)
 }
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequest.kt
index 2d236c36..b0bd9992 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequest.kt
@@ -3,8 +3,8 @@ package org.opensearch.commons.alerting.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.support.WriteRequest
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import java.io.IOException
 
 class DeleteMonitorRequest : ActionRequest {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorResponse.kt
index 3d9b9920..90ac17ba 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorResponse.kt
@@ -1,9 +1,9 @@
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.util.IndexUtils
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequest.kt
index 4990f497..10189e89 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequest.kt
@@ -2,8 +2,8 @@ package org.opensearch.commons.alerting.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import java.io.IOException
 
 class DeleteWorkflowRequest : ActionRequest {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponse.kt
index 8da62c5e..3ccb9f41 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponse.kt
@@ -1,9 +1,9 @@
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.util.IndexUtils
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequest.kt
index c0571753..8b8a5a1f 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequest.kt
@@ -2,9 +2,9 @@ package org.opensearch.commons.alerting.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Table
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import java.io.IOException
 
 class GetAlertsRequest : ActionRequest {
@@ -14,6 +14,7 @@ class GetAlertsRequest : ActionRequest {
     val monitorId: String?
     val alertIndex: String?
     val monitorIds: List<String>?
+    val workflowIds: List<String>?
     val alertIds: List<String>?
 
     constructor(
@@ -23,6 +24,7 @@ class GetAlertsRequest : ActionRequest {
         monitorId: String?,
         alertIndex: String?,
         monitorIds: List<String>? = null,
+        workflowIds: List<String>? = null,
         alertIds: List<String>? = null
     ) : super() {
         this.table = table
@@ -31,6 +33,7 @@ class GetAlertsRequest : ActionRequest {
         this.monitorId = monitorId
         this.alertIndex = alertIndex
         this.monitorIds = monitorIds
+        this.workflowIds = workflowIds
         this.alertIds = alertIds
     }
 
@@ -42,6 +45,7 @@ class GetAlertsRequest : ActionRequest {
         monitorId = sin.readOptionalString(),
         alertIndex = sin.readOptionalString(),
         monitorIds = sin.readOptionalStringList(),
+        workflowIds = sin.readOptionalStringList(),
         alertIds = sin.readOptionalStringList()
     )
 
@@ -57,6 +61,7 @@ class GetAlertsRequest : ActionRequest {
         out.writeOptionalString(monitorId)
         out.writeOptionalString(alertIndex)
         out.writeOptionalStringCollection(monitorIds)
+        out.writeOptionalStringCollection(workflowIds)
         out.writeOptionalStringCollection(alertIds)
     }
 }
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponse.kt
index 37ffaf61..50a4ec53 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponse.kt
@@ -1,9 +1,9 @@
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Alert
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import java.io.IOException
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequest.kt
index ae65ca26..0004d4f1 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequest.kt
@@ -2,9 +2,9 @@ package org.opensearch.commons.alerting.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Table
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import java.io.IOException
 
 class GetFindingsRequest : ActionRequest {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponse.kt
index e0e0d06d..9caeebde 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponse.kt
@@ -1,12 +1,12 @@
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.FindingWithDocs
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
-import org.opensearch.rest.RestStatus
 import java.io.IOException
 
 class GetFindingsResponse : BaseResponse {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsRequest.kt
new file mode 100644
index 00000000..bfa80044
--- /dev/null
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsRequest.kt
@@ -0,0 +1,72 @@
+package org.opensearch.commons.alerting.action
+
+import org.opensearch.action.ActionRequest
+import org.opensearch.action.ActionRequestValidationException
+import org.opensearch.commons.alerting.model.Table
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import java.io.IOException
+
+class GetWorkflowAlertsRequest : ActionRequest {
+    val table: Table
+    val severityLevel: String
+    val alertState: String
+    val alertIndex: String?
+    val associatedAlertsIndex: String?
+    val monitorIds: List<String>?
+    val workflowIds: List<String>?
+    val alertIds: List<String>?
+    val getAssociatedAlerts: Boolean
+
+    constructor(
+        table: Table,
+        severityLevel: String,
+        alertState: String,
+        alertIndex: String?,
+        associatedAlertsIndex: String?,
+        monitorIds: List<String>? = null,
+        workflowIds: List<String>? = null,
+        alertIds: List<String>? = null,
+        getAssociatedAlerts: Boolean,
+    ) : super() {
+        this.table = table
+        this.severityLevel = severityLevel
+        this.alertState = alertState
+        this.alertIndex = alertIndex
+        this.associatedAlertsIndex = associatedAlertsIndex
+        this.monitorIds = monitorIds
+        this.workflowIds = workflowIds
+        this.alertIds = alertIds
+        this.getAssociatedAlerts = getAssociatedAlerts
+    }
+
+    @Throws(IOException::class)
+    constructor(sin: StreamInput) : this(
+        table = Table.readFrom(sin),
+        severityLevel = sin.readString(),
+        alertState = sin.readString(),
+        alertIndex = sin.readOptionalString(),
+        associatedAlertsIndex = sin.readOptionalString(),
+        monitorIds = sin.readOptionalStringList(),
+        workflowIds = sin.readOptionalStringList(),
+        alertIds = sin.readOptionalStringList(),
+        getAssociatedAlerts = sin.readBoolean()
+    )
+
+    override fun validate(): ActionRequestValidationException? {
+        return null
+    }
+
+    @Throws(IOException::class)
+    override fun writeTo(out: StreamOutput) {
+        table.writeTo(out)
+        out.writeString(severityLevel)
+        out.writeString(alertState)
+        out.writeOptionalString(alertIndex)
+        out.writeOptionalString(associatedAlertsIndex)
+        out.writeOptionalStringCollection(monitorIds)
+        out.writeOptionalStringCollection(workflowIds)
+        out.writeOptionalStringCollection(alertIds)
+        out.writeBoolean(getAssociatedAlerts)
+    }
+}
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsResponse.kt
new file mode 100644
index 00000000..4856d747
--- /dev/null
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsResponse.kt
@@ -0,0 +1,51 @@
+package org.opensearch.commons.alerting.action
+
+import org.opensearch.commons.alerting.model.Alert
+import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.xcontent.ToXContent
+import org.opensearch.core.xcontent.XContentBuilder
+import java.io.IOException
+import java.util.Collections
+
+class GetWorkflowAlertsResponse : BaseResponse {
+    val alerts: List<Alert>
+    val associatedAlerts: List<Alert>
+    // totalAlerts is not the same as the size of alerts because there can be 30 alerts from the request, but
+    // the request only asked for 5 alerts, so totalAlerts will be 30, but alerts will only contain 5 alerts
+    val totalAlerts: Int?
+
+    constructor(
+        alerts: List<Alert>,
+        associatedAlerts: List<Alert>,
+        totalAlerts: Int?
+    ) : super() {
+        this.alerts = alerts
+        this.associatedAlerts = associatedAlerts
+        this.totalAlerts = totalAlerts
+    }
+
+    @Throws(IOException::class)
+    constructor(sin: StreamInput) : this(
+        alerts = Collections.unmodifiableList(sin.readList(::Alert)),
+        associatedAlerts = Collections.unmodifiableList(sin.readList(::Alert)),
+        totalAlerts = sin.readOptionalInt()
+    )
+
+    @Throws(IOException::class)
+    override fun writeTo(out: StreamOutput) {
+        out.writeCollection(alerts)
+        out.writeCollection(associatedAlerts)
+        out.writeOptionalInt(totalAlerts)
+    }
+
+    @Throws(IOException::class)
+    override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder {
+        builder.startObject()
+            .field("alerts", alerts)
+            .field("associatedAlerts", associatedAlerts)
+            .field("totalAlerts", totalAlerts)
+        return builder.endObject()
+    }
+}
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequest.kt
index 1b7948cd..cff81206 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequest.kt
@@ -7,8 +7,8 @@ package org.opensearch.commons.alerting.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.rest.RestRequest
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponse.kt
index f18550c5..67bad9d0 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponse.kt
@@ -5,17 +5,17 @@
 
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Workflow
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._ID
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._PRIMARY_TERM
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._SEQ_NO
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._VERSION
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
-import org.opensearch.rest.RestStatus
 import java.io.IOException
 
 class GetWorkflowResponse : BaseResponse {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequest.kt
index 8a7f4b87..34e8d314 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequest.kt
@@ -3,9 +3,9 @@ package org.opensearch.commons.alerting.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.support.WriteRequest
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Monitor
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.rest.RestRequest
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponse.kt
index f0ddda17..0464bff8 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponse.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Monitor
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._ID
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._PRIMARY_TERM
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._SEQ_NO
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._VERSION
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import java.io.IOException
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequest.kt
index 15a895ca..dc2b0936 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequest.kt
@@ -4,10 +4,10 @@ import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
 import org.opensearch.action.support.WriteRequest
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.CompositeInput
 import org.opensearch.commons.alerting.model.Workflow
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.rest.RestRequest
 import java.io.IOException
 import java.util.stream.Collectors
@@ -105,17 +105,17 @@ class IndexWorkflowRequest : ActionRequest {
         val monitorIdOrderMap: Map<String, Int> = delegates.associate { it.monitorId to it.order }
         delegates.forEach {
             if (it.chainedMonitorFindings != null) {
-                if (monitorIdOrderMap.containsKey(it.chainedMonitorFindings!!.monitorId) == false) {
+                if (monitorIdOrderMap.containsKey(it.chainedMonitorFindings.monitorId) == false) {
                     validationException = ValidateActions.addValidationError(
-                        "Chained Findings Monitor ${it.chainedMonitorFindings!!.monitorId} doesn't exist in sequence",
+                        "Chained Findings Monitor ${it.chainedMonitorFindings.monitorId} doesn't exist in sequence",
                         validationException
                     )
                     // Break the flow because next check will generate the NPE
                     return validationException
                 }
-                if (it.order <= monitorIdOrderMap[it.chainedMonitorFindings!!.monitorId]!!) {
+                if (it.order <= monitorIdOrderMap[it.chainedMonitorFindings.monitorId]!!) {
                     validationException = ValidateActions.addValidationError(
-                        "Chained Findings Monitor ${it.chainedMonitorFindings!!.monitorId} should be executed before monitor ${it.monitorId}",
+                        "Chained Findings Monitor ${it.chainedMonitorFindings.monitorId} should be executed before monitor ${it.monitorId}",
                         validationException
                     )
                 }
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponse.kt
index 89863ba5..b54d0d85 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponse.kt
@@ -1,10 +1,10 @@
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Workflow
 import org.opensearch.commons.alerting.util.IndexUtils
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import java.io.IOException
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/PublishFindingsRequest.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/PublishFindingsRequest.kt
index 7118ec44..6e8f78f1 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/PublishFindingsRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/PublishFindingsRequest.kt
@@ -2,9 +2,9 @@ package org.opensearch.commons.alerting.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.model.Finding
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import java.io.IOException
 
 class PublishFindingsRequest : ActionRequest {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/action/SubscribeFindingsResponse.kt b/src/main/kotlin/org/opensearch/commons/alerting/action/SubscribeFindingsResponse.kt
index 494cb701..58419d7c 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/action/SubscribeFindingsResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/action/SubscribeFindingsResponse.kt
@@ -1,11 +1,11 @@
 package org.opensearch.commons.alerting.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.notifications.action.BaseResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
-import org.opensearch.rest.RestStatus
 import java.io.IOException
 
 class SubscribeFindingsResponse : BaseResponse {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregationBuilder.kt b/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregationBuilder.kt
index 37c13350..75d1f3ae 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregationBuilder.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregationBuilder.kt
@@ -1,11 +1,11 @@
 package org.opensearch.commons.alerting.aggregation.bucketselectorext
 
-import org.opensearch.common.ParsingException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.alerting.aggregation.bucketselectorext.BucketSelectorExtFilter.Companion.BUCKET_SELECTOR_COMPOSITE_AGG_FILTER
 import org.opensearch.commons.alerting.aggregation.bucketselectorext.BucketSelectorExtFilter.Companion.BUCKET_SELECTOR_FILTER
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.ParsingException
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregator.kt b/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregator.kt
index a56e01c3..9003102e 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregator.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtAggregator.kt
@@ -1,7 +1,7 @@
 package org.opensearch.commons.alerting.aggregation.bucketselectorext
 
 import org.apache.lucene.util.BytesRef
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.script.BucketAggregationSelectorScript
 import org.opensearch.script.Script
 import org.opensearch.search.DocValueFormat
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtFilter.kt b/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtFilter.kt
index e9bddfa3..55dac69d 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtFilter.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorExtFilter.kt
@@ -1,10 +1,10 @@
 package org.opensearch.commons.alerting.aggregation.bucketselectorext
 
-import org.opensearch.common.ParsingException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
 import org.opensearch.commons.notifications.model.BaseModel
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.ParsingException
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorIndices.kt b/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorIndices.kt
index 94790987..e2352be9 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorIndices.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/aggregation/bucketselectorext/BucketSelectorIndices.kt
@@ -1,6 +1,6 @@
 package org.opensearch.commons.alerting.aggregation.bucketselectorext
 
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.search.aggregations.InternalAggregation
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/alerts/AlertError.kt b/src/main/kotlin/org/opensearch/commons/alerting/alerts/AlertError.kt
index ff6040e8..b53ff4a4 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/alerts/AlertError.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/alerts/AlertError.kt
@@ -1,14 +1,14 @@
 package org.opensearch.commons.alerting.alerts
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken
 import org.opensearch.commons.alerting.util.instant
 import org.opensearch.commons.alerting.util.optionalTimeField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken
 import java.io.IOException
 import java.time.Instant
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/ActionExecutionResult.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/ActionExecutionResult.kt
index 84fd292b..6d4614e8 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/ActionExecutionResult.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/ActionExecutionResult.kt
@@ -1,15 +1,15 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.util.instant
 import org.opensearch.commons.alerting.util.optionalTimeField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.time.Instant
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/AggregationResultBucket.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/AggregationResultBucket.kt
index d6e227d6..caee50f8 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/AggregationResultBucket.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/AggregationResultBucket.kt
@@ -1,15 +1,15 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.ParsingException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken
+import org.opensearch.core.common.ParsingException
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
 import org.opensearch.core.xcontent.XContentParser.Token
+import org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken
 import java.io.IOException
 import java.util.Locale
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Alert.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Alert.kt
index 5c9e947d..af9b0141 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Alert.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Alert.kt
@@ -1,19 +1,19 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.lucene.uid.Versions
-import org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken
 import org.opensearch.commons.alerting.alerts.AlertError
 import org.opensearch.commons.alerting.util.IndexUtils.Companion.NO_SCHEMA_VERSION
 import org.opensearch.commons.alerting.util.instant
 import org.opensearch.commons.alerting.util.optionalTimeField
 import org.opensearch.commons.alerting.util.optionalUserField
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken
 import java.io.IOException
 import java.time.Instant
 
@@ -23,6 +23,7 @@ data class Alert(
     val schemaVersion: Int = NO_SCHEMA_VERSION,
     val monitorId: String,
     val workflowId: String,
+    val workflowName: String,
     val monitorName: String,
     val monitorVersion: Long,
     val monitorUser: User?,
@@ -41,15 +42,15 @@ data class Alert(
     val actionExecutionResults: List<ActionExecutionResult>,
     val aggregationResultBucket: AggregationResultBucket? = null,
     val executionId: String? = null,
+    val associatedAlertIds: List<String>,
 ) : Writeable, ToXContent {
 
     init {
-        if (errorMessage != null) require(state == State.DELETED || state == State.ERROR) {
+        if (errorMessage != null) require(state == State.DELETED || state == State.ERROR || state == State.AUDIT) {
             "Attempt to create an alert with an error in state: $state"
         }
     }
 
-    // constructor for chained alerts.
     constructor(
         startTime: Instant,
         lastNotificationTime: Instant?,
@@ -58,14 +59,30 @@ data class Alert(
         schemaVersion: Int = NO_SCHEMA_VERSION,
         executionId: String,
         chainedAlertTrigger: ChainedAlertTrigger,
-        workflow: Workflow
+        workflow: Workflow,
+        associatedAlertIds: List<String>,
     ) : this(
-        monitorId = NO_ID, monitorName = "", monitorVersion = NO_VERSION, monitorUser = workflow.user,
-        triggerId = chainedAlertTrigger.id, triggerName = chainedAlertTrigger.name, state = state, startTime = startTime,
-        lastNotificationTime = lastNotificationTime, errorMessage = errorMessage, errorHistory = emptyList(),
-        severity = chainedAlertTrigger.severity, actionExecutionResults = emptyList(), schemaVersion = schemaVersion,
-        aggregationResultBucket = null, findingIds = emptyList(), relatedDocIds = emptyList(),
-        executionId = executionId, workflowId = workflow.id
+        monitorId = NO_ID,
+        monitorName = "",
+        monitorVersion = NO_VERSION,
+        monitorUser = workflow.user,
+        triggerId = chainedAlertTrigger.id,
+        triggerName = chainedAlertTrigger.name,
+        state = state,
+        startTime = startTime,
+        lastNotificationTime = lastNotificationTime,
+        errorMessage = errorMessage,
+        errorHistory = emptyList(),
+        severity = chainedAlertTrigger.severity,
+        actionExecutionResults = emptyList(),
+        schemaVersion = schemaVersion,
+        aggregationResultBucket = null,
+        findingIds = emptyList(),
+        relatedDocIds = emptyList(),
+        executionId = executionId,
+        workflowId = workflow.id,
+        workflowName = workflow.name,
+        associatedAlertIds = associatedAlertIds
     )
 
     constructor(
@@ -81,12 +98,27 @@ data class Alert(
         executionId: String? = null,
         workflowId: String? = null,
     ) : this(
-        monitorId = monitor.id, monitorName = monitor.name, monitorVersion = monitor.version, monitorUser = monitor.user,
-        triggerId = trigger.id, triggerName = trigger.name, state = state, startTime = startTime,
-        lastNotificationTime = lastNotificationTime, errorMessage = errorMessage, errorHistory = errorHistory,
-        severity = trigger.severity, actionExecutionResults = actionExecutionResults, schemaVersion = schemaVersion,
-        aggregationResultBucket = null, findingIds = emptyList(), relatedDocIds = emptyList(),
-        executionId = executionId, workflowId = workflowId ?: ""
+        monitorId = monitor.id,
+        monitorName = monitor.name,
+        monitorVersion = monitor.version,
+        monitorUser = monitor.user,
+        triggerId = trigger.id,
+        triggerName = trigger.name,
+        state = state,
+        startTime = startTime,
+        lastNotificationTime = lastNotificationTime,
+        errorMessage = errorMessage,
+        errorHistory = errorHistory,
+        severity = trigger.severity,
+        actionExecutionResults = actionExecutionResults,
+        schemaVersion = schemaVersion,
+        aggregationResultBucket = null,
+        findingIds = emptyList(),
+        relatedDocIds = emptyList(),
+        executionId = executionId,
+        workflowId = workflowId ?: "",
+        workflowName = "",
+        associatedAlertIds = emptyList()
     )
 
     constructor(
@@ -103,12 +135,27 @@ data class Alert(
         executionId: String? = null,
         workflowId: String? = null,
     ) : this(
-        monitorId = monitor.id, monitorName = monitor.name, monitorVersion = monitor.version, monitorUser = monitor.user,
-        triggerId = trigger.id, triggerName = trigger.name, state = state, startTime = startTime,
-        lastNotificationTime = lastNotificationTime, errorMessage = errorMessage, errorHistory = errorHistory,
-        severity = trigger.severity, actionExecutionResults = actionExecutionResults, schemaVersion = schemaVersion,
-        aggregationResultBucket = null, findingIds = findingIds, relatedDocIds = emptyList(),
-        executionId = executionId, workflowId = workflowId ?: ""
+        monitorId = monitor.id,
+        monitorName = monitor.name,
+        monitorVersion = monitor.version,
+        monitorUser = monitor.user,
+        triggerId = trigger.id,
+        triggerName = trigger.name,
+        state = state,
+        startTime = startTime,
+        lastNotificationTime = lastNotificationTime,
+        errorMessage = errorMessage,
+        errorHistory = errorHistory,
+        severity = trigger.severity,
+        actionExecutionResults = actionExecutionResults,
+        schemaVersion = schemaVersion,
+        aggregationResultBucket = null,
+        findingIds = findingIds,
+        relatedDocIds = emptyList(),
+        executionId = executionId,
+        workflowId = workflowId ?: "",
+        workflowName = "",
+        associatedAlertIds = emptyList()
     )
 
     constructor(
@@ -126,12 +173,27 @@ data class Alert(
         executionId: String? = null,
         workflowId: String? = null,
     ) : this(
-        monitorId = monitor.id, monitorName = monitor.name, monitorVersion = monitor.version, monitorUser = monitor.user,
-        triggerId = trigger.id, triggerName = trigger.name, state = state, startTime = startTime,
-        lastNotificationTime = lastNotificationTime, errorMessage = errorMessage, errorHistory = errorHistory,
-        severity = trigger.severity, actionExecutionResults = actionExecutionResults, schemaVersion = schemaVersion,
-        aggregationResultBucket = aggregationResultBucket, findingIds = findingIds, relatedDocIds = emptyList(),
-        executionId = executionId, workflowId = workflowId ?: ""
+        monitorId = monitor.id,
+        monitorName = monitor.name,
+        monitorVersion = monitor.version,
+        monitorUser = monitor.user,
+        triggerId = trigger.id,
+        triggerName = trigger.name,
+        state = state,
+        startTime = startTime,
+        lastNotificationTime = lastNotificationTime,
+        errorMessage = errorMessage,
+        errorHistory = errorHistory,
+        severity = trigger.severity,
+        actionExecutionResults = actionExecutionResults,
+        schemaVersion = schemaVersion,
+        aggregationResultBucket = aggregationResultBucket,
+        findingIds = findingIds,
+        relatedDocIds = emptyList(),
+        executionId = executionId,
+        workflowId = workflowId ?: "",
+        workflowName = "",
+        associatedAlertIds = emptyList()
     )
 
     constructor(
@@ -150,12 +212,28 @@ data class Alert(
         executionId: String? = null,
         workflowId: String? = null,
     ) : this(
-        id = id, monitorId = monitor.id, monitorName = monitor.name, monitorVersion = monitor.version, monitorUser = monitor.user,
-        triggerId = trigger.id, triggerName = trigger.name, state = state, startTime = startTime,
-        lastNotificationTime = lastNotificationTime, errorMessage = errorMessage, errorHistory = errorHistory,
-        severity = trigger.severity, actionExecutionResults = actionExecutionResults, schemaVersion = schemaVersion,
-        aggregationResultBucket = null, findingIds = findingIds, relatedDocIds = relatedDocIds,
-        executionId = executionId, workflowId = workflowId ?: ""
+        id = id,
+        monitorId = monitor.id,
+        monitorName = monitor.name,
+        monitorVersion = monitor.version,
+        monitorUser = monitor.user,
+        triggerId = trigger.id,
+        triggerName = trigger.name,
+        state = state,
+        startTime = startTime,
+        lastNotificationTime = lastNotificationTime,
+        errorMessage = errorMessage,
+        errorHistory = errorHistory,
+        severity = trigger.severity,
+        actionExecutionResults = actionExecutionResults,
+        schemaVersion = schemaVersion,
+        aggregationResultBucket = null,
+        findingIds = findingIds,
+        relatedDocIds = relatedDocIds,
+        executionId = executionId,
+        workflowId = workflowId ?: "",
+        workflowName = "",
+        associatedAlertIds = emptyList()
     )
 
     constructor(
@@ -169,17 +247,35 @@ data class Alert(
         errorHistory: List<AlertError> = mutableListOf(),
         schemaVersion: Int = NO_SCHEMA_VERSION,
         workflowId: String? = null,
+        executionId: String?,
     ) : this(
-        id = id, monitorId = monitor.id, monitorName = monitor.name, monitorVersion = monitor.version, monitorUser = monitor.user,
-        triggerId = trigger.id, triggerName = trigger.name, state = state, startTime = startTime,
-        lastNotificationTime = lastNotificationTime, errorMessage = errorMessage, errorHistory = errorHistory,
-        severity = trigger.severity, actionExecutionResults = listOf(), schemaVersion = schemaVersion,
-        aggregationResultBucket = null, findingIds = listOf(), relatedDocIds = listOf(),
-        workflowId = workflowId ?: ""
+        id = id,
+        monitorId = monitor.id,
+        monitorName = monitor.name,
+        workflowName = "",
+        monitorVersion = monitor.version,
+        monitorUser = monitor.user,
+        triggerId = trigger.id,
+        triggerName = trigger.name,
+        state = state,
+        startTime = startTime,
+        lastNotificationTime = lastNotificationTime,
+        errorMessage = errorMessage,
+        errorHistory = errorHistory,
+        severity = trigger.severity,
+        actionExecutionResults = listOf(),
+        schemaVersion = schemaVersion,
+        aggregationResultBucket = null,
+        findingIds = listOf(),
+        relatedDocIds = listOf(),
+        workflowId = workflowId ?: "",
+        executionId = executionId,
+        associatedAlertIds = emptyList()
     )
 
     enum class State {
         ACTIVE, ACKNOWLEDGED, COMPLETED, ERROR, DELETED,
+
         // Alerts are created in audit state when they are generated by delegate monitors of a workflow.
         // since chained alerts can be configured and acknowledged, the underlying monitors' alerts are simply
         // for evaluating chained alert triggers and auditing purpose.
@@ -194,6 +290,7 @@ data class Alert(
         schemaVersion = sin.readInt(),
         monitorId = sin.readString(),
         workflowId = sin.readString(),
+        workflowName = sin.readString(),
         monitorName = sin.readString(),
         monitorVersion = sin.readLong(),
         monitorUser = if (sin.readBoolean()) {
@@ -213,7 +310,8 @@ data class Alert(
         severity = sin.readString(),
         actionExecutionResults = sin.readList(::ActionExecutionResult),
         aggregationResultBucket = if (sin.readBoolean()) AggregationResultBucket(sin) else null,
-        executionId = sin.readOptionalString()
+        executionId = sin.readOptionalString(),
+        associatedAlertIds = sin.readStringList()
     )
 
     fun isAcknowledged(): Boolean = (state == State.ACKNOWLEDGED)
@@ -225,6 +323,7 @@ data class Alert(
         out.writeInt(schemaVersion)
         out.writeString(monitorId)
         out.writeString(workflowId)
+        out.writeString(workflowName)
         out.writeString(monitorName)
         out.writeLong(monitorVersion)
         out.writeBoolean(monitorUser != null)
@@ -249,6 +348,7 @@ data class Alert(
             out.writeBoolean(false)
         }
         out.writeOptionalString(executionId)
+        out.writeStringCollection(associatedAlertIds)
     }
 
     companion object {
@@ -258,6 +358,7 @@ data class Alert(
         const val ALERT_VERSION_FIELD = "version"
         const val MONITOR_ID_FIELD = "monitor_id"
         const val WORKFLOW_ID_FIELD = "workflow_id"
+        const val WORKFLOW_NAME_FIELD = "workflow_name"
         const val MONITOR_VERSION_FIELD = "monitor_version"
         const val MONITOR_NAME_FIELD = "monitor_name"
         const val MONITOR_USER_FIELD = "monitor_user"
@@ -275,17 +376,20 @@ data class Alert(
         const val SEVERITY_FIELD = "severity"
         const val ACTION_EXECUTION_RESULTS_FIELD = "action_execution_results"
         const val EXECUTION_ID_FIELD = "execution_id"
+        const val ASSOCIATED_ALERT_IDS_FIELD = "associated_alert_ids"
         const val BUCKET_KEYS = AggregationResultBucket.BUCKET_KEYS
         const val PARENTS_BUCKET_PATH = AggregationResultBucket.PARENTS_BUCKET_PATH
         const val NO_ID = ""
         const val NO_VERSION = Versions.NOT_FOUND
 
-        @JvmStatic @JvmOverloads
+        @JvmStatic
+        @JvmOverloads
         @Throws(IOException::class)
         fun parse(xcp: XContentParser, id: String = NO_ID, version: Long = NO_VERSION): Alert {
 
             lateinit var monitorId: String
             var workflowId = ""
+            var workflowName = ""
             var schemaVersion = NO_SCHEMA_VERSION
             lateinit var monitorName: String
             var monitorVersion: Long = Versions.NOT_FOUND
@@ -305,6 +409,7 @@ data class Alert(
             val errorHistory: MutableList<AlertError> = mutableListOf()
             val actionExecutionResults: MutableList<ActionExecutionResult> = mutableListOf()
             var aggAlertBucket: AggregationResultBucket? = null
+            val associatedAlertIds = mutableListOf<String>()
             ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.currentToken(), xcp)
             while (xcp.nextToken() != XContentParser.Token.END_OBJECT) {
                 val fieldName = xcp.currentName()
@@ -313,10 +418,13 @@ data class Alert(
                 when (fieldName) {
                     MONITOR_ID_FIELD -> monitorId = xcp.text()
                     WORKFLOW_ID_FIELD -> workflowId = xcp.text()
+                    WORKFLOW_NAME_FIELD -> workflowName = xcp.text()
                     SCHEMA_VERSION_FIELD -> schemaVersion = xcp.intValue()
                     MONITOR_NAME_FIELD -> monitorName = xcp.text()
                     MONITOR_VERSION_FIELD -> monitorVersion = xcp.longValue()
-                    MONITOR_USER_FIELD -> monitorUser = if (xcp.currentToken() == XContentParser.Token.VALUE_NULL) null else User.parse(xcp)
+                    MONITOR_USER_FIELD ->
+                        monitorUser = if (xcp.currentToken() == XContentParser.Token.VALUE_NULL) null
+                        else User.parse(xcp)
                     TRIGGER_ID_FIELD -> triggerId = xcp.text()
                     FINDING_IDS -> {
                         ensureExpectedToken(XContentParser.Token.START_ARRAY, xcp.currentToken(), xcp)
@@ -338,6 +446,12 @@ data class Alert(
                     ACKNOWLEDGED_TIME_FIELD -> acknowledgedTime = xcp.instant()
                     ERROR_MESSAGE_FIELD -> errorMessage = xcp.textOrNull()
                     EXECUTION_ID_FIELD -> executionId = xcp.textOrNull()
+                    ASSOCIATED_ALERT_IDS_FIELD -> {
+                        ensureExpectedToken(XContentParser.Token.START_ARRAY, xcp.currentToken(), xcp)
+                        while (xcp.nextToken() != XContentParser.Token.END_ARRAY) {
+                            associatedAlertIds.add(xcp.text())
+                        }
+                    }
                     ALERT_HISTORY_FIELD -> {
                         ensureExpectedToken(XContentParser.Token.START_ARRAY, xcp.currentToken(), xcp)
                         while (xcp.nextToken() != XContentParser.Token.END_ARRAY) {
@@ -366,14 +480,31 @@ data class Alert(
             }
 
             return Alert(
-                id = id, version = version, schemaVersion = schemaVersion, monitorId = requireNotNull(monitorId),
-                monitorName = requireNotNull(monitorName), monitorVersion = monitorVersion, monitorUser = monitorUser,
-                triggerId = requireNotNull(triggerId), triggerName = requireNotNull(triggerName),
-                state = requireNotNull(state), startTime = requireNotNull(startTime), endTime = endTime,
-                lastNotificationTime = lastNotificationTime, acknowledgedTime = acknowledgedTime,
-                errorMessage = errorMessage, errorHistory = errorHistory, severity = severity,
-                actionExecutionResults = actionExecutionResults, aggregationResultBucket = aggAlertBucket, findingIds = findingIds,
-                relatedDocIds = relatedDocIds, executionId = executionId, workflowId = workflowId
+                id = id,
+                version = version,
+                schemaVersion = schemaVersion,
+                monitorId = requireNotNull(monitorId),
+                monitorName = requireNotNull(monitorName),
+                monitorVersion = monitorVersion,
+                monitorUser = monitorUser,
+                triggerId = requireNotNull(triggerId),
+                triggerName = requireNotNull(triggerName),
+                state = requireNotNull(state),
+                startTime = requireNotNull(startTime),
+                endTime = endTime,
+                lastNotificationTime = lastNotificationTime,
+                acknowledgedTime = acknowledgedTime,
+                errorMessage = errorMessage,
+                errorHistory = errorHistory,
+                severity = severity,
+                actionExecutionResults = actionExecutionResults,
+                aggregationResultBucket = aggAlertBucket,
+                findingIds = findingIds,
+                relatedDocIds = relatedDocIds,
+                executionId = executionId,
+                workflowId = workflowId,
+                workflowName = workflowName,
+                associatedAlertIds = associatedAlertIds
             )
         }
 
@@ -391,12 +522,15 @@ data class Alert(
     fun toXContentWithUser(builder: XContentBuilder): XContentBuilder {
         return createXContentBuilder(builder, false)
     }
+
     private fun createXContentBuilder(builder: XContentBuilder, secure: Boolean): XContentBuilder {
         builder.startObject()
             .field(ALERT_ID_FIELD, id)
             .field(ALERT_VERSION_FIELD, version)
             .field(MONITOR_ID_FIELD, monitorId)
             .field(WORKFLOW_ID_FIELD, workflowId)
+            .field(WORKFLOW_NAME_FIELD, workflowName)
+            .field(ASSOCIATED_ALERT_IDS_FIELD, associatedAlertIds)
             .field(SCHEMA_VERSION_FIELD, schemaVersion)
             .field(MONITOR_VERSION_FIELD, monitorVersion)
             .field(MONITOR_NAME_FIELD, monitorName)
@@ -432,6 +566,9 @@ data class Alert(
             END_TIME_FIELD to endTime?.toEpochMilli(),
             ERROR_MESSAGE_FIELD to errorMessage,
             EXECUTION_ID_FIELD to executionId,
+            WORKFLOW_ID_FIELD to workflowId,
+            WORKFLOW_NAME_FIELD to workflowName,
+            ASSOCIATED_ALERT_IDS_FIELD to associatedAlertIds,
             LAST_NOTIFICATION_TIME_FIELD to lastNotificationTime?.toEpochMilli(),
             SEVERITY_FIELD to severity,
             START_TIME_FIELD to startTime.toEpochMilli(),
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/BucketLevelTrigger.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/BucketLevelTrigger.kt
index 689c1692..11782318 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/BucketLevelTrigger.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/BucketLevelTrigger.kt
@@ -2,9 +2,6 @@ package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
 import org.opensearch.common.UUIDs
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.aggregation.bucketselectorext.BucketSelectorExtAggregationBuilder
 import org.opensearch.commons.alerting.model.Trigger.Companion.ACTIONS_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.ID_FIELD
@@ -12,10 +9,13 @@ import org.opensearch.commons.alerting.model.Trigger.Companion.NAME_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.SEVERITY_FIELD
 import org.opensearch.commons.alerting.model.action.Action
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 data class BucketLevelTrigger(
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/ChainedAlertTrigger.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/ChainedAlertTrigger.kt
index debc4ca6..c56ce856 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/ChainedAlertTrigger.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/ChainedAlertTrigger.kt
@@ -2,19 +2,19 @@ package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
 import org.opensearch.common.UUIDs
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.model.Trigger.Companion.ACTIONS_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.ID_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.NAME_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.SEVERITY_FIELD
 import org.opensearch.commons.alerting.model.action.Action
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.script.Script
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/ChainedMonitorFindings.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/ChainedMonitorFindings.kt
index cf2bafd6..dbc15e34 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/ChainedMonitorFindings.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/ChainedMonitorFindings.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
 import org.opensearch.commons.utils.validateId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/ClusterMetricsInput.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/ClusterMetricsInput.kt
index 4c6364de..89be9f07 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/ClusterMetricsInput.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/ClusterMetricsInput.kt
@@ -3,14 +3,14 @@ package org.opensearch.commons.alerting.model
 import org.apache.commons.validator.routines.UrlValidator
 import org.apache.hc.core5.net.URIBuilder
 import org.opensearch.common.CheckedFunction
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.net.URI
 import java.net.URISyntaxException
@@ -261,6 +261,13 @@ data class ClusterMetricsInput(
         val requiresPathParams: Boolean
     ) {
         BLANK("", "", "", false, false),
+        CAT_INDICES(
+            "/_cat/indices",
+            "/_cat/indices",
+            "",
+            true,
+            false
+        ),
         CAT_PENDING_TASKS(
             "/_cat/pending_tasks",
             "/_cat/pending_tasks",
@@ -275,6 +282,13 @@ data class ClusterMetricsInput(
             true,
             false
         ),
+        CAT_SHARDS(
+            "/_cat/shards",
+            "/_cat/shards",
+            "",
+            true,
+            false
+        ),
         CAT_SNAPSHOTS(
             "/_cat/snapshots",
             "/_cat/snapshots",
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/CompositeInput.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/CompositeInput.kt
index 229f20e2..7487232b 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/CompositeInput.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/CompositeInput.kt
@@ -1,14 +1,14 @@
 package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 data class CompositeInput(
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/DataSources.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/DataSources.kt
index 87257905..b6beb6a1 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/DataSources.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/DataSources.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 data class DataSources(
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Delegate.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Delegate.kt
index 65158a68..7b36ed88 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Delegate.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Delegate.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
 import org.opensearch.commons.utils.validateId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelMonitorInput.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelMonitorInput.kt
index 0b34a4cd..44eeb65d 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelMonitorInput.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelMonitorInput.kt
@@ -1,14 +1,14 @@
 package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 data class DocLevelMonitorInput(
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt
index 36a37026..83dab26a 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt
@@ -1,12 +1,12 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.lang.IllegalArgumentException
 import java.util.UUID
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/DocumentLevelTrigger.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/DocumentLevelTrigger.kt
index 6f5b9935..c06374cf 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/DocumentLevelTrigger.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/DocumentLevelTrigger.kt
@@ -2,19 +2,19 @@ package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
 import org.opensearch.common.UUIDs
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.model.Trigger.Companion.ACTIONS_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.ID_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.NAME_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.SEVERITY_FIELD
 import org.opensearch.commons.alerting.model.action.Action
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.script.Script
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Finding.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Finding.kt
index d4e69498..673fad96 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Finding.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Finding.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken
 import org.opensearch.commons.alerting.util.instant
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken
 import java.io.IOException
 import java.time.Instant
 
@@ -116,7 +116,7 @@ class Finding(
         const val EXECUTION_ID_FIELD = "execution_id"
         const val NO_ID = ""
 
-        @JvmStatic @JvmOverloads
+        @JvmStatic
         @Throws(IOException::class)
         fun parse(xcp: XContentParser): Finding {
             var id: String = NO_ID
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/FindingDocument.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/FindingDocument.kt
index 9fc6e6b5..9e6d4b83 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/FindingDocument.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/FindingDocument.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.model
 
 import org.apache.logging.log4j.LogManager
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 private val log = LogManager.getLogger(FindingDocument::class.java)
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/FindingWithDocs.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/FindingWithDocs.kt
index 69505fc2..057e2214 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/FindingWithDocs.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/FindingWithDocs.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.model
 
 import org.apache.logging.log4j.LogManager
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 private val log = LogManager.getLogger(Finding::class.java)
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Input.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Input.kt
index 927cb7e8..b3472f8a 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Input.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Input.kt
@@ -1,12 +1,12 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.model.ClusterMetricsInput.Companion.URI_FIELD
 import org.opensearch.commons.alerting.model.DocLevelMonitorInput.Companion.DOC_LEVEL_INPUT_FIELD
 import org.opensearch.commons.alerting.model.SearchInput.Companion.SEARCH_FIELD
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 interface Input : BaseModel {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Monitor.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Monitor.kt
index a7e7b639..1af3ac37 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Monitor.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Monitor.kt
@@ -1,9 +1,6 @@
 package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.util.IndexUtils.Companion.MONITOR_MAX_INPUTS
 import org.opensearch.commons.alerting.util.IndexUtils.Companion.MONITOR_MAX_TRIGGERS
 import org.opensearch.commons.alerting.util.IndexUtils.Companion.NO_SCHEMA_VERSION
@@ -16,10 +13,13 @@ import org.opensearch.commons.alerting.util.optionalTimeField
 import org.opensearch.commons.alerting.util.optionalUserField
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.time.Instant
 import java.util.Locale
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/NoOpTrigger.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/NoOpTrigger.kt
index 92456492..f0d08cbb 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/NoOpTrigger.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/NoOpTrigger.kt
@@ -2,15 +2,15 @@ package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
 import org.opensearch.common.UUIDs
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.model.action.Action
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 data class NoOpTrigger(
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/QueryLevelTrigger.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/QueryLevelTrigger.kt
index d4246f64..d16b85db 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/QueryLevelTrigger.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/QueryLevelTrigger.kt
@@ -2,19 +2,19 @@ package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
 import org.opensearch.common.UUIDs
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.model.Trigger.Companion.ACTIONS_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.ID_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.NAME_FIELD
 import org.opensearch.commons.alerting.model.Trigger.Companion.SEVERITY_FIELD
 import org.opensearch.commons.alerting.model.action.Action
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.script.Script
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Schedule.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Schedule.kt
index d3869c46..1f8d8b7f 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Schedule.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Schedule.kt
@@ -4,13 +4,13 @@ import com.cronutils.model.CronType
 import com.cronutils.model.definition.CronDefinitionBuilder
 import com.cronutils.model.time.ExecutionTime
 import com.cronutils.parser.CronParser
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.time.DateTimeException
 import java.time.Duration
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/ScheduledJob.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/ScheduledJob.kt
index 3df83609..cf8417c2 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/ScheduledJob.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/ScheduledJob.kt
@@ -1,10 +1,10 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.time.Instant
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/SearchInput.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/SearchInput.kt
index 53d20e6e..0eb87c15 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/SearchInput.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/SearchInput.kt
@@ -1,14 +1,14 @@
 package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.search.builder.SearchSourceBuilder
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Sequence.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Sequence.kt
index 108f4004..22d4683b 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Sequence.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Sequence.kt
@@ -1,12 +1,12 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /** Delegate monitors passed as input for composite monitors. */
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Table.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Table.kt
index 66074d21..56d8a575 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Table.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Table.kt
@@ -1,8 +1,8 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import java.io.IOException
 
 data class Table(
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Trigger.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Trigger.kt
index fdc7ae80..1834f3b7 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Trigger.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Trigger.kt
@@ -1,10 +1,10 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.model.action.Action
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 interface Trigger : BaseModel {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/Workflow.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/Workflow.kt
index d2f2518d..2038edfb 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/Workflow.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/Workflow.kt
@@ -1,9 +1,6 @@
 package org.opensearch.commons.alerting.model
 
 import org.opensearch.common.CheckedFunction
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.util.IndexUtils.Companion.NO_SCHEMA_VERSION
 import org.opensearch.commons.alerting.util.IndexUtils.Companion.WORKFLOW_MAX_INPUTS
 import org.opensearch.commons.alerting.util.IndexUtils.Companion._ID
@@ -13,10 +10,13 @@ import org.opensearch.commons.alerting.util.optionalTimeField
 import org.opensearch.commons.alerting.util.optionalUserField
 import org.opensearch.commons.authuser.User
 import org.opensearch.core.ParseField
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.time.Instant
 import java.util.Locale
@@ -36,7 +36,8 @@ data class Workflow(
     val schemaVersion: Int = NO_SCHEMA_VERSION,
     val inputs: List<WorkflowInput>,
     val owner: String? = DEFAULT_OWNER,
-    val triggers: List<Trigger>
+    val triggers: List<Trigger>,
+    val auditDelegateMonitorAlerts: Boolean? = true,
 ) : ScheduledJob {
     override val type = WORKFLOW_TYPE
 
@@ -70,7 +71,8 @@ data class Workflow(
         schemaVersion = sin.readInt(),
         inputs = sin.readList((WorkflowInput)::readFrom),
         owner = sin.readOptionalString(),
-        triggers = sin.readList((Trigger)::readFrom)
+        triggers = sin.readList((Trigger)::readFrom),
+        auditDelegateMonitorAlerts = sin.readOptionalBoolean()
     )
 
     // This enum classifies different workflows
@@ -99,7 +101,7 @@ data class Workflow(
     private fun createXContentBuilder(
         builder: XContentBuilder,
         params: ToXContent.Params,
-        secure: Boolean
+        secure: Boolean,
     ): XContentBuilder {
         builder.startObject()
         if (params.paramAsBoolean("with_type", false)) builder.startObject(type)
@@ -119,6 +121,9 @@ data class Workflow(
             .field(TRIGGERS_FIELD, triggers.toTypedArray())
             .optionalTimeField(LAST_UPDATE_TIME_FIELD, lastUpdateTime)
         builder.field(OWNER_FIELD, owner)
+        if (auditDelegateMonitorAlerts != null) {
+            builder.field(AUDIT_DELEGATE_MONITOR_ALERTS_FIELD, auditDelegateMonitorAlerts)
+        }
         if (params.paramAsBoolean("with_type", false)) builder.endObject()
         return builder.endObject()
     }
@@ -159,6 +164,7 @@ data class Workflow(
             }
             it.writeTo(out)
         }
+        out.writeOptionalBoolean(auditDelegateMonitorAlerts)
     }
 
     companion object {
@@ -177,6 +183,7 @@ data class Workflow(
         const val ENABLED_TIME_FIELD = "enabled_time"
         const val TRIGGERS_FIELD = "triggers"
         const val OWNER_FIELD = "owner"
+        const val AUDIT_DELEGATE_MONITOR_ALERTS_FIELD = "audit_delegate_monitor_alerts"
 
         // This is defined here instead of in ScheduledJob to avoid having the ScheduledJob class know about all
         // the different subclasses and creating circular dependencies
@@ -201,6 +208,7 @@ data class Workflow(
             val inputs: MutableList<WorkflowInput> = mutableListOf()
             val triggers: MutableList<Trigger> = mutableListOf()
             var owner = DEFAULT_OWNER
+            var auditDelegateMonitorAlerts = true
 
             XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.currentToken(), xcp)
             while (xcp.nextToken() != XContentParser.Token.END_OBJECT) {
@@ -245,6 +253,7 @@ data class Workflow(
                     }
                     ENABLED_TIME_FIELD -> enabledTime = xcp.instant()
                     LAST_UPDATE_TIME_FIELD -> lastUpdateTime = xcp.instant()
+                    AUDIT_DELEGATE_MONITOR_ALERTS_FIELD -> auditDelegateMonitorAlerts = xcp.booleanValue()
                     OWNER_FIELD -> {
                         owner = if (xcp.currentToken() == XContentParser.Token.VALUE_NULL) owner else xcp.text()
                     }
@@ -272,7 +281,8 @@ data class Workflow(
                 schemaVersion,
                 inputs.toList(),
                 owner,
-                triggers
+                triggers,
+                auditDelegateMonitorAlerts
             )
         }
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/WorkflowInput.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/WorkflowInput.kt
index bdead75a..d9fd2129 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/WorkflowInput.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/WorkflowInput.kt
@@ -1,9 +1,9 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 interface WorkflowInput : BaseModel {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/action/Action.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/action/Action.kt
index ea0812a2..2d02385f 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/action/Action.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/action/Action.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.model.action
 
 import org.opensearch.common.UUIDs
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.script.Script
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/action/ActionExecutionPolicy.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/action/ActionExecutionPolicy.kt
index 214f49f4..024d9cb2 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/action/ActionExecutionPolicy.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/action/ActionExecutionPolicy.kt
@@ -1,12 +1,12 @@
 package org.opensearch.commons.alerting.model.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 data class ActionExecutionPolicy(
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/action/ActionExecutionScope.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/action/ActionExecutionScope.kt
index 656cb849..6342c33e 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/action/ActionExecutionScope.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/action/ActionExecutionScope.kt
@@ -1,12 +1,12 @@
 package org.opensearch.commons.alerting.model.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 sealed class ActionExecutionScope : BaseModel {
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/action/Throttle.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/action/Throttle.kt
index 2150d60f..79bdb6e3 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/model/action/Throttle.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/model/action/Throttle.kt
@@ -1,13 +1,13 @@
 package org.opensearch.commons.alerting.model.action
 
 import org.apache.commons.codec.binary.StringUtils
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.model.BaseModel
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.time.temporal.ChronoUnit
 import java.util.Locale
diff --git a/src/main/kotlin/org/opensearch/commons/alerting/util/IndexUtils.kt b/src/main/kotlin/org/opensearch/commons/alerting/util/IndexUtils.kt
index 51f9be52..2dbda47b 100644
--- a/src/main/kotlin/org/opensearch/commons/alerting/util/IndexUtils.kt
+++ b/src/main/kotlin/org/opensearch/commons/alerting/util/IndexUtils.kt
@@ -1,12 +1,12 @@
 package org.opensearch.commons.alerting.util
 
-import org.opensearch.common.bytes.BytesReference
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.alerting.model.Monitor
 import org.opensearch.commons.alerting.settings.SupportedClusterMetricsSettings
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.common.bytes.BytesReference
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.time.Instant
 
 class IndexUtils {
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/NotificationsPluginInterface.kt b/src/main/kotlin/org/opensearch/commons/notifications/NotificationsPluginInterface.kt
index c3baa938..59b25054 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/NotificationsPluginInterface.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/NotificationsPluginInterface.kt
@@ -7,7 +7,6 @@ package org.opensearch.commons.notifications
 import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionResponse
 import org.opensearch.client.node.NodeClient
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT
 import org.opensearch.commons.notifications.action.BaseResponse
 import org.opensearch.commons.notifications.action.CreateNotificationConfigRequest
@@ -38,6 +37,7 @@ import org.opensearch.commons.notifications.model.ChannelMessage
 import org.opensearch.commons.notifications.model.EventSource
 import org.opensearch.commons.utils.SecureClientWrapper
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.common.io.stream.Writeable
 
 /**
  * All the transport action plugin interfaces for the Notification plugin
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/BaseResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/BaseResponse.kt
index 8632d9ab..68837e9c 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/BaseResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/BaseResponse.kt
@@ -6,9 +6,9 @@
 package org.opensearch.commons.notifications.action
 
 import org.opensearch.action.ActionResponse
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.ToXContentObject
-import org.opensearch.rest.RestStatus
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/CreateNotificationConfigRequest.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/CreateNotificationConfigRequest.kt
index 29d08084..dea36ef0 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/CreateNotificationConfigRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/CreateNotificationConfigRequest.kt
@@ -6,20 +6,20 @@ package org.opensearch.commons.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_TAG
 import org.opensearch.commons.notifications.model.NotificationConfig
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateId
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/CreateNotificationConfigResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/CreateNotificationConfigResponse.kt
index f91fb89f..3e32a49b 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/CreateNotificationConfigResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/CreateNotificationConfigResponse.kt
@@ -4,15 +4,15 @@
  */
 package org.opensearch.commons.notifications.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigRequest.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigRequest.kt
index 699274f1..6dd78923 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigRequest.kt
@@ -7,17 +7,17 @@ package org.opensearch.commons.notifications.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_LIST_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigResponse.kt
index 71b1e7d9..2337355f 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigResponse.kt
@@ -4,20 +4,20 @@
  */
 package org.opensearch.commons.notifications.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.DELETE_RESPONSE_LIST_TAG
 import org.opensearch.commons.utils.STRING_READER
 import org.opensearch.commons.utils.STRING_WRITER
 import org.opensearch.commons.utils.enumReader
 import org.opensearch.commons.utils.enumWriter
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
-import org.opensearch.rest.RestStatus
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/GetChannelListRequest.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/GetChannelListRequest.kt
index 8be96bfd..c62f38a7 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/GetChannelListRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/GetChannelListRequest.kt
@@ -6,16 +6,16 @@ package org.opensearch.commons.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.COMPACT_TAG
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/GetChannelListResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/GetChannelListResponse.kt
index d91b4b77..57a94a4e 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/GetChannelListResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/GetChannelListResponse.kt
@@ -4,10 +4,10 @@
  */
 package org.opensearch.commons.notifications.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.commons.notifications.model.ChannelList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/GetNotificationConfigRequest.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/GetNotificationConfigRequest.kt
index c5ff31d8..34485a3c 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/GetNotificationConfigRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/GetNotificationConfigRequest.kt
@@ -7,10 +7,6 @@ package org.opensearch.commons.notifications.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_LIST_TAG
 import org.opensearch.commons.notifications.NotificationConstants.DEFAULT_MAX_ITEMS
 import org.opensearch.commons.notifications.NotificationConstants.FILTER_PARAM_LIST_TAG
@@ -24,10 +20,14 @@ import org.opensearch.commons.utils.enumReader
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.search.sort.SortOrder
 import java.io.IOException
 
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/GetNotificationConfigResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/GetNotificationConfigResponse.kt
index 8240d767..6723c015 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/GetNotificationConfigResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/GetNotificationConfigResponse.kt
@@ -4,10 +4,10 @@
  */
 package org.opensearch.commons.notifications.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.commons.notifications.model.NotificationConfigSearchResult
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/GetPluginFeaturesRequest.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/GetPluginFeaturesRequest.kt
index 5e9b930d..0eb0d14d 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/GetPluginFeaturesRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/GetPluginFeaturesRequest.kt
@@ -6,16 +6,16 @@ package org.opensearch.commons.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.COMPACT_TAG
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/GetPluginFeaturesResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/GetPluginFeaturesResponse.kt
index 6601ef67..41a80875 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/GetPluginFeaturesResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/GetPluginFeaturesResponse.kt
@@ -4,19 +4,19 @@
  */
 package org.opensearch.commons.notifications.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.ALLOWED_CONFIG_TYPE_LIST_TAG
 import org.opensearch.commons.notifications.NotificationConstants.PLUGIN_FEATURES_TAG
 import org.opensearch.commons.utils.STRING_READER
 import org.opensearch.commons.utils.STRING_WRITER
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/LegacyPublishNotificationRequest.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/LegacyPublishNotificationRequest.kt
index a4f8024d..7d8cf391 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/LegacyPublishNotificationRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/LegacyPublishNotificationRequest.kt
@@ -7,9 +7,6 @@ package org.opensearch.commons.notifications.action
 
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.commons.destination.message.LegacyBaseMessage
 import org.opensearch.commons.destination.message.LegacyChimeMessage
 import org.opensearch.commons.destination.message.LegacyCustomWebhookMessage
@@ -17,6 +14,9 @@ import org.opensearch.commons.destination.message.LegacyDestinationType
 import org.opensearch.commons.destination.message.LegacyEmailMessage
 import org.opensearch.commons.destination.message.LegacySNSMessage
 import org.opensearch.commons.destination.message.LegacySlackMessage
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/LegacyPublishNotificationResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/LegacyPublishNotificationResponse.kt
index b32f9ac2..c6084358 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/LegacyPublishNotificationResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/LegacyPublishNotificationResponse.kt
@@ -5,10 +5,10 @@
 
 package org.opensearch.commons.notifications.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.commons.destination.response.LegacyDestinationResponse
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import java.io.IOException
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/SendNotificationRequest.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/SendNotificationRequest.kt
index da30648f..060ae545 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/SendNotificationRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/SendNotificationRequest.kt
@@ -7,10 +7,6 @@ package org.opensearch.commons.notifications.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CHANNEL_ID_LIST_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CHANNEL_MESSAGE_TAG
 import org.opensearch.commons.notifications.NotificationConstants.EVENT_SOURCE_TAG
@@ -20,10 +16,14 @@ import org.opensearch.commons.notifications.model.EventSource
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/SendNotificationResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/SendNotificationResponse.kt
index 8feeed8d..e3642e1b 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/SendNotificationResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/SendNotificationResponse.kt
@@ -4,10 +4,10 @@
  */
 package org.opensearch.commons.notifications.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.commons.notifications.model.NotificationEvent
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigRequest.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigRequest.kt
index 865e54f7..d28060aa 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigRequest.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigRequest.kt
@@ -7,19 +7,19 @@ package org.opensearch.commons.notifications.action
 import org.opensearch.action.ActionRequest
 import org.opensearch.action.ActionRequestValidationException
 import org.opensearch.action.ValidateActions
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_TAG
 import org.opensearch.commons.notifications.model.NotificationConfig
 import org.opensearch.commons.utils.logger
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigResponse.kt b/src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigResponse.kt
index 9d1f94ca..42e71a13 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigResponse.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/action/UpdateNotificationConfigResponse.kt
@@ -4,15 +4,15 @@
  */
 package org.opensearch.commons.notifications.action
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/Attachment.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/Attachment.kt
index 8c035071..ff650a20 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/Attachment.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/Attachment.kt
@@ -5,19 +5,19 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.FILE_CONTENT_TYPE_TAG
 import org.opensearch.commons.notifications.NotificationConstants.FILE_DATA_TAG
 import org.opensearch.commons.notifications.NotificationConstants.FILE_ENCODING_TAG
 import org.opensearch.commons.notifications.NotificationConstants.FILE_NAME_TAG
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 
 /**
  * Data class for storing attachment of channel message.
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/BaseModel.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/BaseModel.kt
index 2f9e267c..2271fa7f 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/BaseModel.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/BaseModel.kt
@@ -4,7 +4,7 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContentObject
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/Channel.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/Channel.kt
index 3eb307bd..68f42b27 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/Channel.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/Channel.kt
@@ -4,10 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_TYPE_TAG
 import org.opensearch.commons.notifications.NotificationConstants.DESCRIPTION_TAG
@@ -15,9 +11,13 @@ import org.opensearch.commons.notifications.NotificationConstants.IS_ENABLED_TAG
 import org.opensearch.commons.notifications.NotificationConstants.NAME_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/ChannelList.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/ChannelList.kt
index b7d3c5a7..b92b8425 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/ChannelList.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/ChannelList.kt
@@ -7,8 +7,8 @@ package org.opensearch.commons.notifications.model
 
 import org.apache.lucene.search.TotalHits
 import org.opensearch.action.search.SearchResponse
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.notifications.NotificationConstants.CHANNEL_LIST_TAG
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.XContentParser
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/ChannelMessage.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/ChannelMessage.kt
index 2d0c6412..3fb16981 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/ChannelMessage.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/ChannelMessage.kt
@@ -5,19 +5,19 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.ATTACHMENT_TAG
 import org.opensearch.commons.notifications.NotificationConstants.HTML_DESCRIPTION_TAG
 import org.opensearch.commons.notifications.NotificationConstants.TEXT_DESCRIPTION_TAG
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/Chime.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/Chime.kt
index 64ab4973..ee1c5aa8 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/Chime.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/Chime.kt
@@ -4,17 +4,17 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.URL_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateUrl
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/DeliveryStatus.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/DeliveryStatus.kt
index 7b4a427d..2e25cc70 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/DeliveryStatus.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/DeliveryStatus.kt
@@ -4,17 +4,17 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.STATUS_CODE_TAG
 import org.opensearch.commons.notifications.NotificationConstants.STATUS_TEXT_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/Email.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/Email.kt
index ab6b95e6..a67619b0 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/Email.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/Email.kt
@@ -4,10 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.EMAIL_ACCOUNT_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.EMAIL_GROUP_ID_LIST_TAG
 import org.opensearch.commons.notifications.NotificationConstants.RECIPIENT_LIST_TAG
@@ -15,9 +11,13 @@ import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.objectList
 import org.opensearch.commons.utils.stringList
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/EmailGroup.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/EmailGroup.kt
index 036f47ed..c5377530 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/EmailGroup.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/EmailGroup.kt
@@ -4,16 +4,16 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.RECIPIENT_LIST_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.objectList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/EmailRecipient.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/EmailRecipient.kt
index 732614e6..c601e840 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/EmailRecipient.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/EmailRecipient.kt
@@ -4,16 +4,16 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.RECIPIENT_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateEmail
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/EmailRecipientStatus.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/EmailRecipientStatus.kt
index 9f70ba89..d1d78165 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/EmailRecipientStatus.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/EmailRecipientStatus.kt
@@ -5,17 +5,17 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.DELIVERY_STATUS_TAG
 import org.opensearch.commons.notifications.NotificationConstants.RECIPIENT_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateEmail
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/EventSource.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/EventSource.kt
index 5d634d89..91deb445 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/EventSource.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/EventSource.kt
@@ -4,10 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.REFERENCE_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.SEVERITY_TAG
 import org.opensearch.commons.notifications.NotificationConstants.TAGS_TAG
@@ -15,9 +11,13 @@ import org.opensearch.commons.notifications.NotificationConstants.TITLE_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.stringList
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/EventStatus.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/EventStatus.kt
index 204a7c33..8d1b5a7c 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/EventStatus.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/EventStatus.kt
@@ -5,10 +5,6 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_NAME_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_TYPE_TAG
@@ -18,9 +14,13 @@ import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.objectList
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfig.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfig.kt
index cfbc8fa8..5b0b8a90 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfig.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfig.kt
@@ -4,10 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_TYPE_TAG
 import org.opensearch.commons.notifications.NotificationConstants.DESCRIPTION_TAG
 import org.opensearch.commons.notifications.NotificationConstants.IS_ENABLED_TAG
@@ -18,9 +14,13 @@ import org.opensearch.commons.notifications.model.config.ConfigDataProperties.va
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigInfo.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigInfo.kt
index e7126f1a..34b6285b 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigInfo.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigInfo.kt
@@ -5,19 +5,19 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_ID_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_TAG
 import org.opensearch.commons.notifications.NotificationConstants.CREATED_TIME_TAG
 import org.opensearch.commons.notifications.NotificationConstants.UPDATED_TIME_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.time.Instant
 
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigSearchResult.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigSearchResult.kt
index 50d18e07..7a44836e 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigSearchResult.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationConfigSearchResult.kt
@@ -7,8 +7,8 @@ package org.opensearch.commons.notifications.model
 
 import org.apache.lucene.search.TotalHits
 import org.opensearch.action.search.SearchResponse
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.notifications.NotificationConstants.CONFIG_LIST_TAG
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.XContentParser
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationEvent.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationEvent.kt
index a03e0c52..87f637b0 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationEvent.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/NotificationEvent.kt
@@ -4,20 +4,20 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
 import org.opensearch.common.xcontent.XContentHelper
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.common.xcontent.XContentType
 import org.opensearch.commons.notifications.NotificationConstants.EVENT_SOURCE_TAG
 import org.opensearch.commons.notifications.NotificationConstants.STATUS_LIST_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.objectList
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContent.EMPTY_PARAMS
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/SearchResults.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/SearchResults.kt
index a193f9a8..f6b3a295 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/SearchResults.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/SearchResults.kt
@@ -9,17 +9,17 @@ import org.apache.lucene.search.TotalHits.Relation
 import org.apache.lucene.search.TotalHits.Relation.EQUAL_TO
 import org.apache.lucene.search.TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO
 import org.opensearch.action.search.SearchResponse
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.START_INDEX_TAG
 import org.opensearch.commons.notifications.NotificationConstants.TOTAL_HITS_TAG
 import org.opensearch.commons.notifications.NotificationConstants.TOTAL_HIT_RELATION_TAG
 import org.opensearch.commons.utils.logger
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent.Params
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.search.SearchHit
 
 abstract class SearchResults<ItemClass : BaseModel> : BaseModel {
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/SesAccount.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/SesAccount.kt
index f45f217f..13370ed9 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/SesAccount.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/SesAccount.kt
@@ -5,10 +5,6 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.FROM_ADDRESS_TAG
 import org.opensearch.commons.notifications.NotificationConstants.REGION_TAG
 import org.opensearch.commons.notifications.NotificationConstants.ROLE_ARN_TAG
@@ -17,9 +13,13 @@ import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateEmail
 import org.opensearch.commons.utils.validateIamRoleArn
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/Slack.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/Slack.kt
index da0d46a3..b4433b95 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/Slack.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/Slack.kt
@@ -4,17 +4,17 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.URL_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateUrl
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/SmtpAccount.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/SmtpAccount.kt
index 2fd8aac2..ca3a762a 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/SmtpAccount.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/SmtpAccount.kt
@@ -4,10 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.FROM_ADDRESS_TAG
 import org.opensearch.commons.notifications.NotificationConstants.HOST_TAG
 import org.opensearch.commons.notifications.NotificationConstants.METHOD_TAG
@@ -15,9 +11,13 @@ import org.opensearch.commons.notifications.NotificationConstants.PORT_TAG
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateEmail
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/Sns.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/Sns.kt
index 82585ae6..d0809f9f 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/Sns.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/Sns.kt
@@ -5,18 +5,18 @@
 
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.ROLE_ARN_TAG
 import org.opensearch.commons.notifications.NotificationConstants.TOPIC_ARN_TAG
 import org.opensearch.commons.utils.fieldIfNotNull
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateIamRoleArn
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 import java.util.regex.Pattern
 
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/Webhook.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/Webhook.kt
index 40d71790..e48f29f4 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/Webhook.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/Webhook.kt
@@ -4,10 +4,6 @@
  */
 package org.opensearch.commons.notifications.model
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.commons.notifications.NotificationConstants.HEADER_PARAMS_TAG
 import org.opensearch.commons.notifications.NotificationConstants.METHOD_TAG
 import org.opensearch.commons.notifications.NotificationConstants.URL_TAG
@@ -16,9 +12,13 @@ import org.opensearch.commons.utils.STRING_WRITER
 import org.opensearch.commons.utils.logger
 import org.opensearch.commons.utils.validateUrl
 import org.opensearch.core.common.Strings
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.io.IOException
 
 /**
diff --git a/src/main/kotlin/org/opensearch/commons/notifications/model/config/ConfigDataProperties.kt b/src/main/kotlin/org/opensearch/commons/notifications/model/config/ConfigDataProperties.kt
index 41294e70..28063e30 100644
--- a/src/main/kotlin/org/opensearch/commons/notifications/model/config/ConfigDataProperties.kt
+++ b/src/main/kotlin/org/opensearch/commons/notifications/model/config/ConfigDataProperties.kt
@@ -4,7 +4,6 @@
  */
 package org.opensearch.commons.notifications.model.config
 
-import org.opensearch.common.io.stream.Writeable.Reader
 import org.opensearch.commons.notifications.model.BaseConfigData
 import org.opensearch.commons.notifications.model.Chime
 import org.opensearch.commons.notifications.model.ConfigType
@@ -17,6 +16,7 @@ import org.opensearch.commons.notifications.model.SmtpAccount
 import org.opensearch.commons.notifications.model.Sns
 import org.opensearch.commons.notifications.model.Webhook
 import org.opensearch.commons.notifications.model.XParser
+import org.opensearch.core.common.io.stream.Writeable.Reader
 import org.opensearch.core.xcontent.XContentParser
 
 internal object ConfigDataProperties {
diff --git a/src/main/kotlin/org/opensearch/commons/utils/EnumHelpers.kt b/src/main/kotlin/org/opensearch/commons/utils/EnumHelpers.kt
index bb57dc50..6ffcdaed 100644
--- a/src/main/kotlin/org/opensearch/commons/utils/EnumHelpers.kt
+++ b/src/main/kotlin/org/opensearch/commons/utils/EnumHelpers.kt
@@ -4,10 +4,10 @@
  */
 package org.opensearch.commons.utils
 
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
-import org.opensearch.common.xcontent.XContentParserUtils
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import java.util.EnumSet
 
 inline fun <reified E : Enum<E>> XContentParser.enumSet(enumParser: EnumParser<E>): EnumSet<E> {
diff --git a/src/main/kotlin/org/opensearch/commons/utils/TransportHelpers.kt b/src/main/kotlin/org/opensearch/commons/utils/TransportHelpers.kt
index cec7ba81..07d1ddb4 100644
--- a/src/main/kotlin/org/opensearch/commons/utils/TransportHelpers.kt
+++ b/src/main/kotlin/org/opensearch/commons/utils/TransportHelpers.kt
@@ -5,13 +5,13 @@
 
 package org.opensearch.commons.utils
 
-import org.opensearch.common.io.stream.InputStreamStreamInput
-import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput
-import org.opensearch.common.io.stream.NamedWriteableRegistry
-import org.opensearch.common.io.stream.OutputStreamStreamOutput
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.io.stream.StreamOutput
-import org.opensearch.common.io.stream.Writeable
+import org.opensearch.core.common.io.stream.InputStreamStreamInput
+import org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry
+import org.opensearch.core.common.io.stream.OutputStreamStreamOutput
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.Writeable
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 
diff --git a/src/main/kotlin/org/opensearch/commons/utils/XContentHelpers.kt b/src/main/kotlin/org/opensearch/commons/utils/XContentHelpers.kt
index a049aefc..e2fe0ddf 100644
--- a/src/main/kotlin/org/opensearch/commons/utils/XContentHelpers.kt
+++ b/src/main/kotlin/org/opensearch/commons/utils/XContentHelpers.kt
@@ -5,15 +5,15 @@
 
 package org.opensearch.commons.utils
 
-import org.opensearch.common.io.stream.StreamInput
-import org.opensearch.common.xcontent.XContentParserUtils
 import org.opensearch.common.xcontent.XContentType
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.DeprecationHandler
 import org.opensearch.core.xcontent.NamedXContentRegistry
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.ToXContentObject
 import org.opensearch.core.xcontent.XContentBuilder
 import org.opensearch.core.xcontent.XContentParser
+import org.opensearch.core.xcontent.XContentParserUtils
 import org.opensearch.rest.RestRequest
 
 fun StreamInput.createJsonParser(): XContentParser {
diff --git a/src/test/java/org/opensearch/commons/authuser/UserTest.java b/src/test/java/org/opensearch/commons/authuser/UserTest.java
index 3453d802..56152477 100644
--- a/src/test/java/org/opensearch/commons/authuser/UserTest.java
+++ b/src/test/java/org/opensearch/commons/authuser/UserTest.java
@@ -16,10 +16,10 @@
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class UserTest {
 
diff --git a/src/test/java/org/opensearch/commons/destination/message/LegacyChimeMessageTest.java b/src/test/java/org/opensearch/commons/destination/message/LegacyChimeMessageTest.java
index 191fef30..b5f57b46 100644
--- a/src/test/java/org/opensearch/commons/destination/message/LegacyChimeMessageTest.java
+++ b/src/test/java/org/opensearch/commons/destination/message/LegacyChimeMessageTest.java
@@ -12,7 +12,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class LegacyChimeMessageTest {
 
diff --git a/src/test/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessageTest.java b/src/test/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessageTest.java
index 855e2cbc..dba1b65d 100644
--- a/src/test/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessageTest.java
+++ b/src/test/java/org/opensearch/commons/destination/message/LegacyCustomWebhookMessageTest.java
@@ -16,7 +16,7 @@
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.junit.jupiter.api.Test;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class LegacyCustomWebhookMessageTest {
 
diff --git a/src/test/java/org/opensearch/commons/destination/message/LegacyEmailMessageTest.java b/src/test/java/org/opensearch/commons/destination/message/LegacyEmailMessageTest.java
index 06625053..bc4546fd 100644
--- a/src/test/java/org/opensearch/commons/destination/message/LegacyEmailMessageTest.java
+++ b/src/test/java/org/opensearch/commons/destination/message/LegacyEmailMessageTest.java
@@ -14,7 +14,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class LegacyEmailMessageTest {
 
diff --git a/src/test/java/org/opensearch/commons/destination/message/LegacySlackMessageTest.java b/src/test/java/org/opensearch/commons/destination/message/LegacySlackMessageTest.java
index 6b04d651..2ea3ea59 100644
--- a/src/test/java/org/opensearch/commons/destination/message/LegacySlackMessageTest.java
+++ b/src/test/java/org/opensearch/commons/destination/message/LegacySlackMessageTest.java
@@ -12,7 +12,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class LegacySlackMessageTest {
 
diff --git a/src/test/java/org/opensearch/commons/destination/response/LegacyDestinationResponseTest.java b/src/test/java/org/opensearch/commons/destination/response/LegacyDestinationResponseTest.java
index e9189d24..dc7cc079 100644
--- a/src/test/java/org/opensearch/commons/destination/response/LegacyDestinationResponseTest.java
+++ b/src/test/java/org/opensearch/commons/destination/response/LegacyDestinationResponseTest.java
@@ -12,7 +12,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.io.stream.StreamInput;
 
 public class LegacyDestinationResponseTest {
 
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/AlertingPluginInterfaceTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/AlertingPluginInterfaceTests.kt
index 7f4c98fc..ca07168d 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/AlertingPluginInterfaceTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/AlertingPluginInterfaceTests.kt
@@ -12,10 +12,10 @@ import org.mockito.junit.jupiter.MockitoExtension
 import org.opensearch.action.ActionListener
 import org.opensearch.action.ActionType
 import org.opensearch.client.node.NodeClient
-import org.opensearch.common.io.stream.NamedWriteableRegistry
 import org.opensearch.common.settings.Settings
 import org.opensearch.commons.alerting.action.AcknowledgeAlertRequest
 import org.opensearch.commons.alerting.action.AcknowledgeAlertResponse
+import org.opensearch.commons.alerting.action.AcknowledgeChainedAlertRequest
 import org.opensearch.commons.alerting.action.DeleteMonitorRequest
 import org.opensearch.commons.alerting.action.DeleteMonitorResponse
 import org.opensearch.commons.alerting.action.DeleteWorkflowRequest
@@ -24,6 +24,8 @@ import org.opensearch.commons.alerting.action.GetAlertsRequest
 import org.opensearch.commons.alerting.action.GetAlertsResponse
 import org.opensearch.commons.alerting.action.GetFindingsRequest
 import org.opensearch.commons.alerting.action.GetFindingsResponse
+import org.opensearch.commons.alerting.action.GetWorkflowAlertsRequest
+import org.opensearch.commons.alerting.action.GetWorkflowAlertsResponse
 import org.opensearch.commons.alerting.action.GetWorkflowRequest
 import org.opensearch.commons.alerting.action.GetWorkflowResponse
 import org.opensearch.commons.alerting.action.IndexMonitorRequest
@@ -36,8 +38,9 @@ import org.opensearch.commons.alerting.model.FindingDocument
 import org.opensearch.commons.alerting.model.FindingWithDocs
 import org.opensearch.commons.alerting.model.Monitor
 import org.opensearch.commons.alerting.model.Workflow
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry
+import org.opensearch.core.rest.RestStatus
 import org.opensearch.index.seqno.SequenceNumbers
-import org.opensearch.rest.RestStatus
 import org.opensearch.search.SearchModule
 
 @Suppress("UNCHECKED_CAST")
@@ -52,7 +55,13 @@ internal class AlertingPluginInterfaceTests {
         val monitor = randomQueryLevelMonitor()
 
         val request = mock(IndexMonitorRequest::class.java)
-        val response = IndexMonitorResponse(Monitor.NO_ID, Monitor.NO_VERSION, SequenceNumbers.UNASSIGNED_SEQ_NO, SequenceNumbers.UNASSIGNED_PRIMARY_TERM, monitor)
+        val response = IndexMonitorResponse(
+            Monitor.NO_ID,
+            Monitor.NO_VERSION,
+            SequenceNumbers.UNASSIGNED_SEQ_NO,
+            SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
+            monitor
+        )
         val listener: ActionListener<IndexMonitorResponse> =
             mock(ActionListener::class.java) as ActionListener<IndexMonitorResponse>
         val namedWriteableRegistry = NamedWriteableRegistry(SearchModule(Settings.EMPTY, emptyList()).namedWriteables)
@@ -95,7 +104,13 @@ internal class AlertingPluginInterfaceTests {
         val monitor = randomBucketLevelMonitor()
 
         val request = mock(IndexMonitorRequest::class.java)
-        val response = IndexMonitorResponse(Monitor.NO_ID, Monitor.NO_VERSION, SequenceNumbers.UNASSIGNED_SEQ_NO, SequenceNumbers.UNASSIGNED_PRIMARY_TERM, monitor)
+        val response = IndexMonitorResponse(
+            Monitor.NO_ID,
+            Monitor.NO_VERSION,
+            SequenceNumbers.UNASSIGNED_SEQ_NO,
+            SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
+            monitor
+        )
         val listener: ActionListener<IndexMonitorResponse> =
             mock(ActionListener::class.java) as ActionListener<IndexMonitorResponse>
         val namedWriteableRegistry = NamedWriteableRegistry(SearchModule(Settings.EMPTY, emptyList()).namedWriteables)
@@ -173,6 +188,21 @@ internal class AlertingPluginInterfaceTests {
         Mockito.verify(listener, Mockito.times(1)).onResponse(ArgumentMatchers.eq(response))
     }
 
+    @Test
+    fun getWorkflowAlerts() {
+        val request = mock(GetWorkflowAlertsRequest::class.java)
+        val response = GetWorkflowAlertsResponse(listOf(randomChainedAlert()), emptyList(), 1)
+        val listener: ActionListener<GetWorkflowAlertsResponse> =
+            mock(ActionListener::class.java) as ActionListener<GetWorkflowAlertsResponse>
+
+        Mockito.doAnswer {
+            (it.getArgument(2) as ActionListener<GetWorkflowAlertsResponse>)
+                .onResponse(response)
+        }.whenever(client).execute(Mockito.any(ActionType::class.java), Mockito.any(), Mockito.any())
+        AlertingPluginInterface.getWorkflowAlerts(client, request, listener)
+        Mockito.verify(listener, Mockito.times(1)).onResponse(ArgumentMatchers.eq(response))
+    }
+
     @Test
     fun getFindings() {
         val finding = randomFinding()
@@ -225,4 +255,18 @@ internal class AlertingPluginInterfaceTests {
         AlertingPluginInterface.acknowledgeAlerts(client, request, listener)
         Mockito.verify(listener, Mockito.times(1)).onResponse(ArgumentMatchers.eq(response))
     }
+
+    @Test
+    fun acknowledgeChainedAlerts() {
+        val request = mock(AcknowledgeChainedAlertRequest::class.java)
+        val response = AcknowledgeAlertResponse(acknowledged = listOf(), failed = listOf(), missing = listOf())
+        val listener: ActionListener<AcknowledgeAlertResponse> =
+            mock(ActionListener::class.java) as ActionListener<AcknowledgeAlertResponse>
+        Mockito.doAnswer {
+            (it.getArgument(2) as ActionListener<AcknowledgeAlertResponse>)
+                .onResponse(response)
+        }.whenever(client).execute(Mockito.any(ActionType::class.java), Mockito.any(), Mockito.any())
+        AlertingPluginInterface.acknowledgeChainedAlerts(client, request, listener)
+        Mockito.verify(listener, Mockito.times(1)).onResponse(ArgumentMatchers.eq(response))
+    }
 }
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/TestHelpers.kt b/src/test/kotlin/org/opensearch/commons/alerting/TestHelpers.kt
index 14f62fbf..a0d32843 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/TestHelpers.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/TestHelpers.kt
@@ -173,6 +173,7 @@ fun randomWorkflow(
     enabledTime: Instant? = if (enabled) Instant.now().truncatedTo(ChronoUnit.MILLIS) else null,
     lastUpdateTime: Instant = Instant.now().truncatedTo(ChronoUnit.MILLIS),
     triggers: List<Trigger> = listOf(randomChainedAlertTrigger()),
+    auditDelegateMonitorAlerts: Boolean? = true
 ): Workflow {
     val delegates = mutableListOf<Delegate>()
     if (!monitorIds.isNullOrEmpty()) {
@@ -195,7 +196,7 @@ fun randomWorkflow(
     return Workflow(
         name = name, workflowType = Workflow.WorkflowType.COMPOSITE, enabled = enabled, inputs = input,
         schedule = schedule, enabledTime = enabledTime, lastUpdateTime = lastUpdateTime, user = user,
-        triggers = triggers
+        triggers = triggers, auditDelegateMonitorAlerts = auditDelegateMonitorAlerts
     )
 }
 
@@ -394,7 +395,10 @@ fun randomDocLevelMonitorInput(
 }
 
 fun randomClusterMetricsInput(
-    path: String = ClusterMetricsInput.ClusterMetricType.CLUSTER_HEALTH.defaultPath,
+    path: String = ClusterMetricsInput.ClusterMetricType.values()
+        .filter { it.defaultPath.isNotBlank() && !it.requiresPathParams }
+        .random()
+        .defaultPath,
     pathParams: String = "",
     url: String = ""
 ): ClusterMetricsInput {
@@ -535,7 +539,8 @@ fun randomChainedAlert(
         errorMessage = null,
         executionId = UUID.randomUUID().toString(),
         chainedAlertTrigger = trigger,
-        workflow = workflow
+        workflow = workflow,
+        associatedAlertIds = listOf("a1")
     )
 }
 
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequestTests.kt
index a3be117a..cbd9e98a 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertRequestTests.kt
@@ -10,7 +10,7 @@ import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
 import org.opensearch.action.support.WriteRequest
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 
 class AcknowledgeAlertRequestTests {
 
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponseTests.kt
index 0b4fd699..5733c550 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponseTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeAlertResponseTests.kt
@@ -4,11 +4,11 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.alerting.alerts.AlertError
 import org.opensearch.commons.alerting.model.ActionExecutionResult
 import org.opensearch.commons.alerting.model.Alert
 import org.opensearch.commons.alerting.randomUser
+import org.opensearch.core.common.io.stream.StreamInput
 import java.time.Instant
 
 class AcknowledgeAlertResponseTests {
@@ -18,18 +18,60 @@ class AcknowledgeAlertResponseTests {
 
         val acknowledged = mutableListOf(
             Alert(
-                "1234", 0L, 1, "monitor-1234", "", "test-monitor", 0L, randomUser(),
-                "trigger-14", "test-trigger", ArrayList(), ArrayList(), Alert.State.ACKNOWLEDGED,
-                Instant.now(), Instant.now(), Instant.now(), Instant.now(), null, ArrayList(),
-                "sev-2", ArrayList(), null
+                id = "1234",
+                version = 0L,
+                schemaVersion = 1,
+                monitorId = "monitor-1234",
+                workflowId = "",
+                workflowName = "",
+                monitorName = "test-monitor",
+                monitorVersion = 0L,
+                monitorUser = randomUser(),
+                triggerId = "trigger-14",
+                triggerName = "test-trigger",
+                findingIds = ArrayList(),
+                relatedDocIds = ArrayList(),
+                state = Alert.State.ACKNOWLEDGED,
+                startTime = Instant.now(),
+                endTime = Instant.now(),
+                lastNotificationTime = Instant.now(),
+                acknowledgedTime = Instant.now(),
+                errorMessage = null,
+                errorHistory = ArrayList(),
+                severity = "sev-2",
+                actionExecutionResults = ArrayList(),
+                aggregationResultBucket = null,
+                executionId = null,
+                associatedAlertIds = emptyList()
             )
         )
         val failed = mutableListOf(
             Alert(
-                "1234", 0L, 1, "monitor-1234", "", "test-monitor", 0L, randomUser(),
-                "trigger-14", "test-trigger", ArrayList(), ArrayList(), Alert.State.ERROR, Instant.now(), Instant.now(),
-                Instant.now(), Instant.now(), null, mutableListOf(AlertError(Instant.now(), "Error msg")),
-                "sev-2", mutableListOf(ActionExecutionResult("7890", null, 0)), null
+                id = "1234",
+                version = 0L,
+                schemaVersion = 1,
+                monitorId = "monitor-1234",
+                workflowId = "",
+                workflowName = "",
+                monitorName = "test-monitor",
+                monitorVersion = 0L,
+                monitorUser = randomUser(),
+                triggerId = "trigger-14",
+                triggerName = "test-trigger",
+                findingIds = ArrayList(),
+                relatedDocIds = ArrayList(),
+                state = Alert.State.ERROR,
+                startTime = Instant.now(),
+                endTime = Instant.now(),
+                lastNotificationTime = Instant.now(),
+                acknowledgedTime = Instant.now(),
+                errorMessage = null,
+                errorHistory = mutableListOf(AlertError(Instant.now(), "Error msg")),
+                severity = "sev-2",
+                actionExecutionResults = mutableListOf(ActionExecutionResult("7890", null, 0)),
+                aggregationResultBucket = null,
+                executionId = null,
+                associatedAlertIds = emptyList()
             )
         )
         val missing = mutableListOf("1", "2", "3", "4")
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequestTests.kt
index 012e370e..b624edfa 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/AcknowledgeChainedAlertRequestTests.kt
@@ -7,9 +7,10 @@ package org.opensearch.commons.alerting.action
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 
 class AcknowledgeChainedAlertRequestTests {
 
@@ -23,5 +24,6 @@ class AcknowledgeChainedAlertRequestTests {
         val newReq = AcknowledgeChainedAlertRequest(sin)
         assertEquals("1234", newReq.workflowId)
         assertEquals(4, newReq.alertIds.size)
+        assertNull(newReq.validate())
     }
 }
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequestTests.kt
index 43fa43e3..38c89fc5 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteMonitorRequestTests.kt
@@ -1,10 +1,11 @@
 package org.opensearch.commons.alerting.action
 
-import org.junit.Assert
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
 import org.opensearch.action.support.WriteRequest
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 
 class DeleteMonitorRequestTests {
 
@@ -12,15 +13,15 @@ class DeleteMonitorRequestTests {
     fun `test delete monitor request`() {
 
         val req = DeleteMonitorRequest("1234", WriteRequest.RefreshPolicy.IMMEDIATE)
-        Assert.assertNotNull(req)
-        Assert.assertEquals("1234", req.monitorId)
-        Assert.assertEquals("true", req.refreshPolicy.value)
+        assertNotNull(req)
+        assertEquals("1234", req.monitorId)
+        assertEquals("true", req.refreshPolicy.value)
 
         val out = BytesStreamOutput()
         req.writeTo(out)
         val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
         val newReq = DeleteMonitorRequest(sin)
-        Assert.assertEquals("1234", newReq.monitorId)
-        Assert.assertEquals("true", newReq.refreshPolicy.value)
+        assertEquals("1234", newReq.monitorId)
+        assertEquals("true", newReq.refreshPolicy.value)
     }
 }
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequestTests.kt
index 8ebe91f3..a92ee17e 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowRequestTests.kt
@@ -3,7 +3,7 @@ package org.opensearch.commons.alerting.action
 import org.junit.Assert
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 
 class DeleteWorkflowRequestTests {
 
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponseTests.kt
index 299925f4..b3d82b90 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponseTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/DeleteWorkflowResponseTests.kt
@@ -3,7 +3,7 @@ package org.opensearch.commons.alerting.action
 import org.junit.Assert
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 
 class DeleteWorkflowResponseTests {
 
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequestTests.kt
index 32ade4ba..bf301f74 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetAlertsRequestTests.kt
@@ -6,8 +6,8 @@ import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.alerting.model.Table
+import org.opensearch.core.common.io.stream.StreamInput
 
 internal class GetAlertsRequestTests {
 
@@ -16,7 +16,16 @@ internal class GetAlertsRequestTests {
 
         val table = Table("asc", "sortString", null, 1, 0, "")
 
-        val req = GetAlertsRequest(table, "1", "active", null, null, listOf("1", "2"), listOf("alert1", "alert2"))
+        val req = GetAlertsRequest(
+            table = table,
+            severityLevel = "1",
+            alertState = "active",
+            monitorId = null,
+            alertIndex = null,
+            monitorIds = listOf("1", "2"),
+            alertIds = listOf("alert1", "alert2"),
+            workflowIds = listOf("w1", "w2"),
+        )
         assertNotNull(req)
 
         val out = BytesStreamOutput()
@@ -32,6 +41,8 @@ internal class GetAlertsRequestTests {
         assertTrue(newReq.monitorIds!!.contains("2"))
         assertTrue(newReq.alertIds!!.contains("alert1"))
         assertTrue(newReq.alertIds!!.contains("alert2"))
+        assertTrue(newReq.workflowIds!!.contains("w1"))
+        assertTrue(newReq.workflowIds!!.contains("w2"))
     }
 
     @Test
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponseTests.kt
index 524b0aaa..6a1cb877 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponseTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetAlertsResponseTests.kt
@@ -5,11 +5,11 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.alerting.builder
 import org.opensearch.commons.alerting.model.Alert
 import org.opensearch.commons.alerting.randomUser
 import org.opensearch.commons.alerting.util.string
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.core.xcontent.ToXContent
 import java.time.Instant
 import java.util.Collections
@@ -32,28 +32,27 @@ class GetAlertsResponseTests {
     @Test
     fun `test get alerts response with alerts`() {
         val alert = Alert(
-            "id",
-            0L,
-            0,
-            "monitorId",
-            "workflowId",
-            "monitorName",
-            0L,
-            randomUser(),
-            "triggerId",
-            "triggerName",
-            Collections.emptyList(),
-            Collections.emptyList(),
-            Alert.State.ACKNOWLEDGED,
-            Instant.MIN,
-            null,
-            null,
-            null,
-            null,
-            Collections.emptyList(),
-            "severity",
-            Collections.emptyList(),
-            null
+            monitorId = "id",
+            monitorName = "name",
+            monitorVersion = Alert.NO_VERSION,
+            monitorUser = randomUser(),
+            triggerId = "triggerId",
+            triggerName = "triggerNamer",
+            state = Alert.State.ACKNOWLEDGED,
+            startTime = Instant.now(),
+            lastNotificationTime = null,
+            errorMessage = null,
+            errorHistory = emptyList(),
+            severity = "high",
+            actionExecutionResults = emptyList(),
+            schemaVersion = 0,
+            aggregationResultBucket = null,
+            findingIds = emptyList(),
+            relatedDocIds = emptyList(),
+            executionId = "executionId",
+            workflowId = "workflowId",
+            workflowName = "",
+            associatedAlertIds = emptyList()
         )
         val req = GetAlertsResponse(listOf(alert), 1)
         assertNotNull(req)
@@ -71,39 +70,39 @@ class GetAlertsResponseTests {
     @Test
     fun `test toXContent for get alerts response`() {
         val now = Instant.now()
-
         val alert = Alert(
-            "id",
-            0L,
-            0,
-            "monitorId",
-            "workflowId",
-            "monitorName",
-            0L,
-            null,
-            "triggerId",
-            "triggerName",
-            Collections.emptyList(),
-            Collections.emptyList(),
-            Alert.State.ACKNOWLEDGED,
-            now,
-            null,
-            null,
-            null,
-            null,
-            Collections.emptyList(),
-            "severity",
-            Collections.emptyList(),
-            null
+            monitorId = "id",
+            monitorName = "name",
+            monitorVersion = Alert.NO_VERSION,
+            monitorUser = randomUser(),
+            triggerId = "triggerId",
+            triggerName = "triggerNamer",
+            state = Alert.State.ACKNOWLEDGED,
+            startTime = now,
+            lastNotificationTime = null,
+            errorMessage = null,
+            errorHistory = emptyList(),
+            severity = "high",
+            actionExecutionResults = emptyList(),
+            schemaVersion = 0,
+            aggregationResultBucket = null,
+            findingIds = emptyList(),
+            relatedDocIds = emptyList(),
+            executionId = "executionId",
+            workflowId = "wid",
+            workflowName = "",
+            associatedAlertIds = emptyList()
         )
+
         val req = GetAlertsResponse(listOf(alert), 1)
         var actualXContentString = req.toXContent(builder(), ToXContent.EMPTY_PARAMS).string()
-        val expectedXContentString = "{\"alerts\":[{\"id\":\"id\",\"version\":0,\"monitor_id\":\"monitorId\"," +
-            "\"workflow_id\":\"workflowId\",\"schema_version\":0,\"monitor_version\":0,\"monitor_name\":\"monitorName\"," +
-            "\"execution_id\":null,\"trigger_id\":\"triggerId\",\"trigger_name\":\"triggerName\"," +
-            "\"finding_ids\":[],\"related_doc_ids\":[],\"state\":\"ACKNOWLEDGED\",\"error_message\":null,\"alert_history\":[]," +
-            "\"severity\":\"severity\",\"action_execution_results\":[],\"start_time\":" + now.toEpochMilli() +
-            ",\"last_notification_time\":null,\"end_time\":null,\"acknowledged_time\":null}],\"totalAlerts\":1}"
+        val expectedXContentString = "{\"alerts\":[{\"id\":\"\",\"version\":-1,\"monitor_id\":\"id\",\"workflow_id\":\"wid\"," +
+            "\"workflow_name\":\"\",\"associated_alert_ids\":[],\"schema_version\":0,\"monitor_version\":-1," +
+            "\"monitor_name\":\"name\",\"execution_id\":\"executionId\",\"trigger_id\":\"triggerId\"," +
+            "\"trigger_name\":\"triggerNamer\",\"finding_ids\":[],\"related_doc_ids\":[],\"state\":\"ACKNOWLEDGED\"," +
+            "\"error_message\":null,\"alert_history\":[],\"severity\":\"high\",\"action_execution_results\":[]," +
+            "\"start_time\":${now.toEpochMilli()},\"last_notification_time\":null,\"end_time\":null," +
+            "\"acknowledged_time\":null}],\"totalAlerts\":1}"
         assertEquals(expectedXContentString, actualXContentString)
     }
 }
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequestTests.kt
index f83cb8de..253f4708 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsRequestTests.kt
@@ -6,8 +6,8 @@ import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.alerting.model.Table
+import org.opensearch.core.common.io.stream.StreamInput
 
 internal class GetFindingsRequestTests {
 
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponseTests.kt
index e5b391bb..8d40492a 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponseTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponseTests.kt
@@ -3,12 +3,12 @@ package org.opensearch.commons.alerting.action
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.alerting.model.DocLevelQuery
 import org.opensearch.commons.alerting.model.Finding
 import org.opensearch.commons.alerting.model.FindingDocument
 import org.opensearch.commons.alerting.model.FindingWithDocs
-import org.opensearch.rest.RestStatus
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.rest.RestStatus
 import java.time.Instant
 
 internal class GetFindingsResponseTests {
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsRequestTests.kt
new file mode 100644
index 00000000..1cf50eec
--- /dev/null
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsRequestTests.kt
@@ -0,0 +1,101 @@
+package org.opensearch.commons.alerting.action
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.opensearch.common.io.stream.BytesStreamOutput
+import org.opensearch.commons.alerting.model.Table
+import org.opensearch.core.common.io.stream.StreamInput
+
+internal class GetWorkflowAlertsRequestTests {
+
+    @Test
+    fun `test get alerts request`() {
+
+        val table = Table("asc", "sortString", null, 1, 0, "")
+
+        val req = GetWorkflowAlertsRequest(
+            table = table,
+            severityLevel = "1",
+            alertState = "active",
+            getAssociatedAlerts = true,
+            workflowIds = listOf("w1", "w2"),
+            alertIds = emptyList(),
+            alertIndex = null,
+            associatedAlertsIndex = null,
+            monitorIds = emptyList()
+        )
+        assertNotNull(req)
+
+        val out = BytesStreamOutput()
+        req.writeTo(out)
+        val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
+        val newReq = GetWorkflowAlertsRequest(sin)
+
+        assertEquals("1", newReq.severityLevel)
+        assertEquals("active", newReq.alertState)
+        assertEquals(table, newReq.table)
+        assertTrue(newReq.workflowIds!!.contains("w1"))
+        assertTrue(newReq.workflowIds!!.contains("w2"))
+        assertTrue(newReq.alertIds!!.isEmpty())
+        assertTrue(newReq.monitorIds!!.isEmpty())
+        assertNull(newReq.alertIndex)
+        assertNull(newReq.associatedAlertsIndex)
+        assertTrue(newReq.getAssociatedAlerts)
+    }
+
+    @Test
+    fun `test get alerts request with custom alerts and associated alerts indices`() {
+
+        val table = Table("asc", "sortString", null, 1, 0, "")
+
+        val req = GetWorkflowAlertsRequest(
+            table = table,
+            severityLevel = "1",
+            alertState = "active",
+            getAssociatedAlerts = true,
+            workflowIds = listOf("w1", "w2"),
+            alertIds = emptyList(),
+            alertIndex = "alertIndex",
+            associatedAlertsIndex = "associatedAlertsIndex",
+            monitorIds = emptyList()
+        )
+        assertNotNull(req)
+
+        val out = BytesStreamOutput()
+        req.writeTo(out)
+        val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
+        val newReq = GetWorkflowAlertsRequest(sin)
+
+        assertEquals("1", newReq.severityLevel)
+        assertEquals("active", newReq.alertState)
+        assertEquals(table, newReq.table)
+        assertTrue(newReq.workflowIds!!.contains("w1"))
+        assertTrue(newReq.workflowIds!!.contains("w2"))
+        assertTrue(newReq.alertIds!!.isEmpty())
+        assertTrue(newReq.monitorIds!!.isEmpty())
+        assertEquals(newReq.alertIndex, "alertIndex")
+        assertEquals(newReq.associatedAlertsIndex, "associatedAlertsIndex")
+        assertTrue(newReq.getAssociatedAlerts)
+    }
+
+    @Test
+    fun `test validate returns null`() {
+        val table = Table("asc", "sortString", null, 1, 0, "")
+
+        val req = GetWorkflowAlertsRequest(
+            table = table,
+            severityLevel = "1",
+            alertState = "active",
+            getAssociatedAlerts = true,
+            workflowIds = listOf("w1, w2"),
+            alertIds = emptyList(),
+            alertIndex = null,
+            associatedAlertsIndex = null
+        )
+        assertNotNull(req)
+        assertNull(req.validate())
+    }
+}
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsResponseTests.kt
new file mode 100644
index 00000000..947fead8
--- /dev/null
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowAlertsResponseTests.kt
@@ -0,0 +1,96 @@
+package org.opensearch.commons.alerting.action
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import org.opensearch.common.io.stream.BytesStreamOutput
+import org.opensearch.commons.alerting.builder
+import org.opensearch.commons.alerting.model.Alert
+import org.opensearch.commons.alerting.randomAlert
+import org.opensearch.commons.alerting.randomChainedAlert
+import org.opensearch.commons.alerting.randomUser
+import org.opensearch.commons.alerting.util.string
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.xcontent.ToXContent
+import java.time.Instant
+import java.util.Collections
+
+class GetWorkflowAlertsResponseTests {
+
+    @Test
+    fun `test get alerts response with no alerts`() {
+        val req = GetWorkflowAlertsResponse(Collections.emptyList(), emptyList(), 0)
+        assertNotNull(req)
+
+        val out = BytesStreamOutput()
+        req.writeTo(out)
+        val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
+        val newReq = GetWorkflowAlertsResponse(sin)
+        assertTrue(newReq.alerts.isEmpty())
+        assertTrue(newReq.associatedAlerts.isEmpty())
+        assertEquals(0, newReq.totalAlerts)
+    }
+
+    @Test
+    fun `test get alerts response with alerts`() {
+        val chainedAlert1 = randomChainedAlert()
+        val chainedAlert2 = randomChainedAlert()
+        val alert1 = randomAlert()
+        val alert2 = randomAlert()
+        val req = GetWorkflowAlertsResponse(listOf(chainedAlert1, chainedAlert2), listOf(alert1, alert2), 2)
+        assertNotNull(req)
+
+        val out = BytesStreamOutput()
+        req.writeTo(out)
+        val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
+        val newReq = GetWorkflowAlertsResponse(sin)
+        assertEquals(2, newReq.alerts.size)
+        assertEquals(2, newReq.associatedAlerts.size)
+        assertEquals(2, newReq.totalAlerts)
+        assertTrue(newReq.alerts.contains(chainedAlert1))
+        assertTrue(newReq.alerts.contains(chainedAlert2))
+        assertTrue(newReq.associatedAlerts.contains(alert1))
+        assertTrue(newReq.associatedAlerts.contains(alert2))
+    }
+
+    @Test
+    fun `test toXContent for get alerts response`() {
+        val alert = Alert(
+            monitorId = "id",
+            monitorName = "name",
+            monitorVersion = Alert.NO_VERSION,
+            monitorUser = randomUser(),
+            triggerId = "triggerId",
+            triggerName = "triggerNamer",
+            state = Alert.State.ACKNOWLEDGED,
+            startTime = Instant.ofEpochMilli(1688591410974),
+            lastNotificationTime = null,
+            errorMessage = null,
+            errorHistory = emptyList(),
+            severity = "high",
+            actionExecutionResults = emptyList(),
+            schemaVersion = 0,
+            aggregationResultBucket = null,
+            findingIds = emptyList(),
+            relatedDocIds = emptyList(),
+            executionId = "executionId",
+            workflowId = "wid",
+            workflowName = "",
+            associatedAlertIds = emptyList()
+        )
+
+        val req = GetWorkflowAlertsResponse(listOf(alert), emptyList(), 1)
+        var actualXContentString = req.toXContent(builder(), ToXContent.EMPTY_PARAMS).string()
+        val expectedXContentString =
+            "{\"alerts\":[{\"id\":\"\",\"version\":-1,\"monitor_id\":\"id\"," +
+                "\"workflow_id\":\"wid\",\"workflow_name\":\"\",\"associated_alert_ids\":[]," +
+                "\"schema_version\":0,\"monitor_version\":-1,\"monitor_name\":\"name\",\"execution_id\":" +
+                "\"executionId\",\"trigger_id\":\"triggerId\",\"trigger_name\":\"triggerNamer\",\"finding_ids\":[]," +
+                "\"related_doc_ids\":[],\"state\":\"ACKNOWLEDGED\",\"error_message\":null,\"alert_history\":[]," +
+                "\"severity\":\"high\",\"action_execution_results\":[],\"start_time\":1688591410974," +
+                "\"last_notification_time\":null,\"end_time\":null,\"acknowledged_time\":null}]," +
+                "\"associatedAlerts\":[],\"totalAlerts\":1}"
+        assertEquals(expectedXContentString, actualXContentString)
+    }
+}
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequestTests.kt
index c9e8ebca..e7c4be06 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowRequestTests.kt
@@ -3,7 +3,7 @@ package org.opensearch.commons.alerting.action
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.rest.RestRequest
 
 class GetWorkflowRequestTests {
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponseTests.kt
index 91a22fc4..8e78b61f 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponseTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetWorkflowResponseTests.kt
@@ -3,15 +3,22 @@ package org.opensearch.commons.alerting.action
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
+import org.opensearch.commons.alerting.model.CompositeInput
+import org.opensearch.commons.alerting.model.IntervalSchedule
+import org.opensearch.commons.alerting.model.Workflow
+import org.opensearch.commons.alerting.randomDelegate
+import org.opensearch.commons.alerting.randomUser
 import org.opensearch.commons.alerting.randomWorkflow
-import org.opensearch.rest.RestStatus
+import org.opensearch.core.common.io.stream.StreamInput
+import org.opensearch.core.rest.RestStatus
+import java.time.Instant
+import java.time.temporal.ChronoUnit
 
 class GetWorkflowResponseTests {
 
     @Test
-    fun testGetWorkflowRequest() {
-        val workflow = randomWorkflow()
+    fun testGetWorkflowResponse() {
+        val workflow = randomWorkflow(auditDelegateMonitorAlerts = false)
         val response = GetWorkflowResponse(
             id = "id", version = 1, seqNo = 1, primaryTerm = 1, status = RestStatus.OK, workflow = workflow
         )
@@ -20,7 +27,39 @@ class GetWorkflowResponseTests {
         val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
         val newRes = GetWorkflowResponse(sin)
         Assertions.assertEquals("id", newRes.id)
+        Assertions.assertFalse(newRes.workflow!!.auditDelegateMonitorAlerts!!)
         Assertions.assertEquals(workflow.name, newRes.workflow!!.name)
         Assertions.assertEquals(workflow.owner, newRes.workflow!!.owner)
     }
+
+    @Test
+    fun testGetWorkflowResponseWhereAuditDelegateMonitorAlertsFlagIsNotSet() {
+        val workflow = Workflow(
+            id = "",
+            version = Workflow.NO_VERSION,
+            name = "test",
+            enabled = true,
+            schemaVersion = 2,
+            schedule = IntervalSchedule(1, ChronoUnit.MINUTES),
+            lastUpdateTime = Instant.now(),
+            enabledTime = Instant.now(),
+            workflowType = Workflow.WorkflowType.COMPOSITE,
+            user = randomUser(),
+            inputs = listOf(CompositeInput(org.opensearch.commons.alerting.model.Sequence(listOf(randomDelegate())))),
+            owner = "",
+            triggers = listOf()
+        )
+        val response = GetWorkflowResponse(
+            id = "id", version = 1, seqNo = 1, primaryTerm = 1, status = RestStatus.OK, workflow = workflow
+        )
+        val out = BytesStreamOutput()
+        response.writeTo(out)
+        val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
+        val newRes = GetWorkflowResponse(sin)
+        Assertions.assertEquals("id", newRes.id)
+        Assertions.assertTrue(newRes.workflow!!.auditDelegateMonitorAlerts!!)
+        Assertions.assertEquals(workflow.name, newRes.workflow!!.name)
+        Assertions.assertEquals(workflow.owner, newRes.workflow!!.owner)
+        Assertions.assertEquals(workflow.auditDelegateMonitorAlerts, newRes.workflow!!.auditDelegateMonitorAlerts)
+    }
 }
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequestTests.kt
index 34a1c334..20381c9b 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorRequestTests.kt
@@ -4,14 +4,14 @@ import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opensearch.action.support.WriteRequest
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput
-import org.opensearch.common.io.stream.NamedWriteableRegistry
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.settings.Settings
 import org.opensearch.commons.alerting.model.SearchInput
 import org.opensearch.commons.alerting.randomBucketLevelMonitor
 import org.opensearch.commons.alerting.randomQueryLevelMonitor
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.rest.RestRequest
 import org.opensearch.search.SearchModule
 import org.opensearch.search.builder.SearchSourceBuilder
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponseTests.kt
index f9332649..2b5ee04d 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponseTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/IndexMonitorResponseTests.kt
@@ -3,10 +3,10 @@ package org.opensearch.commons.alerting.action
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.alerting.model.CronSchedule
 import org.opensearch.commons.alerting.model.Monitor
 import org.opensearch.commons.alerting.randomUser
+import org.opensearch.core.common.io.stream.StreamInput
 import java.time.Instant
 import java.time.ZoneId
 
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequestTests.kt
index d25cd5b2..8ff08738 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequestTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowRequestTests.kt
@@ -5,9 +5,6 @@ import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opensearch.action.support.WriteRequest
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput
-import org.opensearch.common.io.stream.NamedWriteableRegistry
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.common.settings.Settings
 import org.opensearch.commons.alerting.model.ChainedMonitorFindings
 import org.opensearch.commons.alerting.model.CompositeInput
@@ -16,6 +13,9 @@ import org.opensearch.commons.alerting.model.Sequence
 import org.opensearch.commons.alerting.randomWorkflow
 import org.opensearch.commons.alerting.randomWorkflowWithDelegates
 import org.opensearch.commons.utils.recreateObject
+import org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput
+import org.opensearch.core.common.io.stream.NamedWriteableRegistry
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.rest.RestRequest
 import org.opensearch.search.SearchModule
 import java.lang.Exception
@@ -29,7 +29,7 @@ class IndexWorkflowRequestTests {
 
         val req = IndexWorkflowRequest(
             "1234", 1L, 2L, WriteRequest.RefreshPolicy.IMMEDIATE, RestRequest.Method.POST,
-            randomWorkflow()
+            randomWorkflow(auditDelegateMonitorAlerts = false)
         )
         Assertions.assertNotNull(req)
 
@@ -42,6 +42,7 @@ class IndexWorkflowRequestTests {
         Assertions.assertEquals(2L, newReq.primaryTerm)
         Assertions.assertEquals(RestRequest.Method.POST, newReq.method)
         Assertions.assertNotNull(newReq.workflow)
+        Assertions.assertFalse(newReq.workflow.auditDelegateMonitorAlerts!!)
     }
 
     @Test
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponseTests.kt
index 8565d093..6594010e 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponseTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/IndexWorkflowResponseTests.kt
@@ -3,12 +3,12 @@ package org.opensearch.commons.alerting.action
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.alerting.model.ChainedAlertTrigger
 import org.opensearch.commons.alerting.model.CronSchedule
 import org.opensearch.commons.alerting.model.Workflow
 import org.opensearch.commons.alerting.randomChainedAlertTrigger
 import org.opensearch.commons.alerting.randomUser
+import org.opensearch.core.common.io.stream.StreamInput
 import java.time.Instant
 import java.time.ZoneId
 
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/PublishFindingsRequestTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/PublishFindingsRequestTests.kt
new file mode 100644
index 00000000..d29ef7c6
--- /dev/null
+++ b/src/test/kotlin/org/opensearch/commons/alerting/action/PublishFindingsRequestTests.kt
@@ -0,0 +1,29 @@
+package org.opensearch.commons.alerting.action
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
+import org.opensearch.common.io.stream.BytesStreamOutput
+import org.opensearch.commons.alerting.randomFinding
+import org.opensearch.core.common.io.stream.StreamInput
+
+class PublishFindingsRequestTests {
+
+    @Test
+    fun `test delete monitor request`() {
+
+        val finding = randomFinding()
+        val monitorId = "mid"
+        val req = PublishFindingsRequest(monitorId, finding)
+        assertNotNull(req)
+        assertEquals(monitorId, req.monitorId)
+        assertEquals(finding, req.finding)
+
+        val out = BytesStreamOutput()
+        req.writeTo(out)
+        val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes)
+        val newReq = PublishFindingsRequest(sin)
+        assertEquals(monitorId, newReq.monitorId)
+        assertEquals(finding.id, newReq.finding.id)
+    }
+}
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/MockScheduledJob.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/MockScheduledJob.kt
index bf2ddfa3..59f3771b 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/model/MockScheduledJob.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/model/MockScheduledJob.kt
@@ -1,6 +1,6 @@
 package org.opensearch.commons.alerting.model
 
-import org.opensearch.common.io.stream.StreamOutput
+import org.opensearch.core.common.io.stream.StreamOutput
 import org.opensearch.core.xcontent.ToXContent
 import org.opensearch.core.xcontent.XContentBuilder
 import java.io.IOException
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt
index 0c6c1b07..9454aa48 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt
@@ -3,7 +3,6 @@ package org.opensearch.commons.alerting.model
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opensearch.common.io.stream.BytesStreamOutput
-import org.opensearch.common.io.stream.StreamInput
 import org.opensearch.commons.alerting.model.action.Action
 import org.opensearch.commons.alerting.model.action.ActionExecutionPolicy
 import org.opensearch.commons.alerting.model.action.Throttle
@@ -19,6 +18,7 @@ import org.opensearch.commons.alerting.randomUser
 import org.opensearch.commons.alerting.randomUserEmpty
 import org.opensearch.commons.alerting.randomWorkflow
 import org.opensearch.commons.authuser.User
+import org.opensearch.core.common.io.stream.StreamInput
 import org.opensearch.search.builder.SearchSourceBuilder
 
 class WriteableTests {
diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt
index a96f967c..63588755 100644
--- a/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt
@@ -96,7 +96,13 @@ class XContentTests {
         val throttleString = throttle.toXContent(builder(), ToXContent.EMPTY_PARAMS).string()
         val wrongThrottleString = throttleString.replace("MINUTES", "wrongunit")
 
-        assertFailsWith<IllegalArgumentException>("Only support MINUTES throttle unit") { Throttle.parse(parser(wrongThrottleString)) }
+        assertFailsWith<IllegalArgumentException>("Only support MINUTES throttle unit") {
+            Throttle.parse(
+                parser(
+                    wrongThrottleString
+                )
+            )
+        }
     }
 
     @Test
@@ -104,7 +110,13 @@ class XContentTests {
         val throttle = randomThrottle().copy(value = -1)
         val throttleString = throttle.toXContent(builder(), ToXContent.EMPTY_PARAMS).string()
 
-        assertFailsWith<IllegalArgumentException>("Can only set positive throttle period") { Throttle.parse(parser(throttleString)) }
+        assertFailsWith<IllegalArgumentException>("Can only set positive throttle period") {
+            Throttle.parse(
+                parser(
+                    throttleString
+                )
+            )
+        }
     }
 
     fun `test query-level monitor parsing`() {
@@ -132,7 +144,13 @@ class XContentTests {
             }
         """.trimIndent()
 
-        assertFailsWith<IllegalArgumentException>("Monitor name is null") { Monitor.parse(parser(monitorStringWithoutName)) }
+        assertFailsWith<IllegalArgumentException>("Monitor name is null") {
+            Monitor.parse(
+                parser(
+                    monitorStringWithoutName
+                )
+            )
+        }
     }
 
     @Test
@@ -169,6 +187,14 @@ class XContentTests {
         Assertions.assertEquals(workflow, parsedMonitor, "Round tripping BucketLevelMonitor doesn't work")
     }
 
+    @Test
+    fun `test composite workflow parsing with auditDelegateMonitorAlerts flag disabled`() {
+        val workflow = randomWorkflow(auditDelegateMonitorAlerts = false)
+        val monitorString = workflow.toJsonStringWithUser()
+        val parsedMonitor = Workflow.parse(parser(monitorString))
+        Assertions.assertEquals(workflow, parsedMonitor, "Round tripping BucketLevelMonitor doesn't work")
+    }
+
     @Test
     fun `test query-level trigger parsing`() {
         val trigger = randomQueryLevelTrigger()
@@ -390,8 +416,14 @@ class XContentTests {
     fun `test alert parsing with noop trigger`() {
         val monitor = randomQueryLevelMonitor()
         val alert = Alert(
-            monitor = monitor, trigger = NoOpTrigger(), startTime = Instant.now().truncatedTo(ChronoUnit.MILLIS),
-            errorMessage = "some error", lastNotificationTime = Instant.now()
+            id = "",
+            monitor = monitor,
+            trigger = NoOpTrigger(),
+            startTime = Instant.now().truncatedTo(ChronoUnit.MILLIS),
+            errorMessage = "some error",
+            lastNotificationTime = Instant.now(),
+            workflowId = "",
+            executionId = ""
         )
         assertEquals("Round tripping alert doesn't work", alert.triggerName, "NoOp trigger")
     }
@@ -410,12 +442,13 @@ class XContentTests {
 
     @Test
     fun `test alert parsing with user as null`() {
-        val alertStr = "{\"id\":\"\",\"version\":-1,\"monitor_id\":\"\",\"schema_version\":0,\"monitor_version\":1,\"monitor_user\":null," +
-            "\"monitor_name\":\"ARahqfRaJG\",\"trigger_id\":\"fhe1-XQBySl0wQKDBkOG\",\"trigger_name\":\"ffELMuhlro\"," +
-            "\"state\":\"ACTIVE\",\"error_message\":null,\"alert_history\":[],\"severity\":\"1\",\"action_execution_results\"" +
-            ":[{\"action_id\":\"ghe1-XQBySl0wQKDBkOG\",\"last_execution_time\":1601917224583,\"throttled_count\":-1478015168}," +
-            "{\"action_id\":\"gxe1-XQBySl0wQKDBkOH\",\"last_execution_time\":1601917224583,\"throttled_count\":-768533744}]," +
-            "\"start_time\":1601917224599,\"last_notification_time\":null,\"end_time\":null,\"acknowledged_time\":null}"
+        val alertStr =
+            "{\"id\":\"\",\"version\":-1,\"monitor_id\":\"\",\"schema_version\":0,\"monitor_version\":1,\"monitor_user\":null," +
+                "\"monitor_name\":\"ARahqfRaJG\",\"trigger_id\":\"fhe1-XQBySl0wQKDBkOG\",\"trigger_name\":\"ffELMuhlro\"," +
+                "\"state\":\"ACTIVE\",\"error_message\":null,\"alert_history\":[],\"severity\":\"1\",\"action_execution_results\"" +
+                ":[{\"action_id\":\"ghe1-XQBySl0wQKDBkOG\",\"last_execution_time\":1601917224583,\"throttled_count\":-1478015168}," +
+                "{\"action_id\":\"gxe1-XQBySl0wQKDBkOH\",\"last_execution_time\":1601917224583,\"throttled_count\":-768533744}]," +
+                "\"start_time\":1601917224599,\"last_notification_time\":null,\"end_time\":null,\"acknowledged_time\":null}"
         val parsedAlert = Alert.parse(parser(alertStr))
         OpenSearchTestCase.assertNull(parsedAlert.monitorUser)
     }
diff --git a/src/test/kotlin/org/opensearch/commons/notifications/NotificationsPluginInterfaceTests.kt b/src/test/kotlin/org/opensearch/commons/notifications/NotificationsPluginInterfaceTests.kt
index 61cbca7a..2e09db60 100644
--- a/src/test/kotlin/org/opensearch/commons/notifications/NotificationsPluginInterfaceTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/notifications/NotificationsPluginInterfaceTests.kt
@@ -49,7 +49,7 @@ import org.opensearch.commons.notifications.model.NotificationConfigSearchResult
 import org.opensearch.commons.notifications.model.NotificationEvent
 import org.opensearch.commons.notifications.model.SeverityType
 import org.opensearch.commons.notifications.model.Slack
-import org.opensearch.rest.RestStatus
+import org.opensearch.core.rest.RestStatus
 import java.time.Instant
 
 @Suppress("UNCHECKED_CAST")
diff --git a/src/test/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigResponseTests.kt b/src/test/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigResponseTests.kt
index fb574114..a05fbca5 100644
--- a/src/test/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigResponseTests.kt
+++ b/src/test/kotlin/org/opensearch/commons/notifications/action/DeleteNotificationConfigResponseTests.kt
@@ -11,7 +11,7 @@ import org.junit.jupiter.api.assertThrows
 import org.opensearch.commons.utils.createObjectFromJsonString
 import org.opensearch.commons.utils.getJsonString
 import org.opensearch.commons.utils.recreateObject
-import org.opensearch.rest.RestStatus
+import org.opensearch.core.rest.RestStatus
 
 internal class DeleteNotificationConfigResponseTests {