diff --git a/src/Messaging/Common/BlockStorageInfo.cs b/src/Messaging/Common/BlockStorageInfo.cs
index 4fed0e3..67645f3 100644
--- a/src/Messaging/Common/BlockStorageInfo.cs
+++ b/src/Messaging/Common/BlockStorageInfo.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using System.Text.Json.Serialization;
 using Newtonsoft.Json;
 
 namespace Monai.Deploy.Messaging.Common
@@ -24,12 +25,14 @@ public class BlockStorageInfo
         /// Gets or sets the root path to the file.
         /// </summary>
         [JsonProperty(PropertyName = "path")]
+        [JsonPropertyName("path")]
         public string Path { get; set; } = default!;
 
         /// <summary>
         /// Gets or sets the root path to the metadata file.
         /// </summary>
         [JsonProperty(PropertyName = "metadata")]
+        [JsonPropertyName("metadata")]
         public string Metadata { get; set; } = default!;
     }
 }
diff --git a/src/Messaging/Common/Credentials.cs b/src/Messaging/Common/Credentials.cs
index de0bdb5..4a9fc16 100644
--- a/src/Messaging/Common/Credentials.cs
+++ b/src/Messaging/Common/Credentials.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2022-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Newtonsoft.Json;
 
 namespace Monai.Deploy.Messaging.Common
@@ -25,6 +26,7 @@ public class Credentials
         /// Gets or sets the access key or user name of the credentials pair.
         /// </summary>
         [JsonProperty(PropertyName = "access_key")]
+        [JsonPropertyName("access_key")]
         [Required]
         public string AccessKey { get; set; }
 
@@ -32,6 +34,7 @@ public class Credentials
         /// Gets or sets the access token or password of the credentials pair.
         /// </summary>
         [JsonProperty(PropertyName = "access_token")]
+        [JsonPropertyName("access_token")]
         [Required]
         public string AccessToken { get; set; }
 
@@ -39,6 +42,7 @@ public class Credentials
         /// Gets or sets the session token of the credentials pair.
         /// </summary>
         [JsonProperty(PropertyName = "session_token")]
+        [JsonPropertyName("session_token")]
         public string SessionToken { get; set; }
 
         public Credentials()
diff --git a/src/Messaging/Common/Storage.cs b/src/Messaging/Common/Storage.cs
index 3d71135..3c6ea74 100644
--- a/src/Messaging/Common/Storage.cs
+++ b/src/Messaging/Common/Storage.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2022-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Newtonsoft.Json;
 
 namespace Monai.Deploy.Messaging.Common
@@ -26,6 +27,7 @@ public class Storage : ICloneable
         /// For Argo, name of the artifact used in the template.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
+        [JsonPropertyName("name")]
         [Required]
         public string Name { get; set; }
 
@@ -33,6 +35,7 @@ public class Storage : ICloneable
         /// Gets or sets the endpoint of the storage service.
         /// </summary>
         [JsonProperty(PropertyName = "endpoint")]
+        [JsonPropertyName("endpoint")]
         [Required]
         public string Endpoint { get; set; }
 
@@ -40,12 +43,14 @@ public class Storage : ICloneable
         /// Gets or sets credentials for accessing the storage service.
         /// </summary>
         [JsonProperty(PropertyName = "credentials")]
+        [JsonPropertyName("credentials")]
         public Credentials? Credentials { get; set; }
 
         /// <summary>
         /// Gets or sets name of the bucket.
         /// </summary>
         [JsonProperty(PropertyName = "bucket")]
+        [JsonPropertyName("bucket")]
         [Required]
         public string Bucket { get; set; }
 
@@ -53,12 +58,14 @@ public class Storage : ICloneable
         /// Gets or sets whether the connection should be secured or not.
         /// </summary>
         [JsonProperty(PropertyName = "secured_connection")]
+        [JsonPropertyName("secured_connection")]
         public bool SecuredConnection { get; set; }
 
         /// <summary>
         /// Gets or sets the optional relative root path to the data.
         /// </summary>
         [JsonProperty(PropertyName = "relative_root_path")]
+        [JsonPropertyName("relative_root_path")]
         [Required]
         public string RelativeRootPath { get; set; }
 
diff --git a/src/Messaging/Events/EmailRequestEvent.cs b/src/Messaging/Events/EmailRequestEvent.cs
index 195eb37..4ffb2a7 100644
--- a/src/Messaging/Events/EmailRequestEvent.cs
+++ b/src/Messaging/Events/EmailRequestEvent.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2022-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Newtonsoft.Json;
 
 namespace Monai.Deploy.Messaging.Events
@@ -22,29 +23,36 @@ namespace Monai.Deploy.Messaging.Events
     public class EmailRequestEvent : EventBase
     {
         [JsonProperty(PropertyName = "id")]
+        [JsonPropertyName("id")]
         [Required]
         public Guid Id { get; set; }
 
         [JsonProperty(PropertyName = "workflow_instance_id")]
+        [JsonPropertyName("workflow_instance_id")]
         [Required]
         public string WorkflowInstanceId { get; set; }
 
         [JsonProperty(PropertyName = "workflow_name")]
+        [JsonPropertyName("workflow_name")]
         [Required]
         public string WorkflowName { get; set; }
 
         [JsonProperty(PropertyName = "task_id")]
+        [JsonPropertyName("task_id")]
         [Required]
         public string TaskId { get; set; }
 
         [JsonProperty(PropertyName = "roles")]
+        [JsonPropertyName("roles")]
         public string Roles { get; set; }
 
         [JsonProperty(PropertyName = "emails")]
+        [JsonPropertyName("emails")]
         public string Emails { get; set; }
 
         [Required]
         [JsonProperty(PropertyName = "metadata")]
+        [JsonPropertyName("metadata")]
         public Dictionary<string, string> Metadata { get; set; }
 
         public EmailRequestEvent()
diff --git a/src/Messaging/Events/ExportCompleteEvent.cs b/src/Messaging/Events/ExportCompleteEvent.cs
index 7893189..5a048df 100755
--- a/src/Messaging/Events/ExportCompleteEvent.cs
+++ b/src/Messaging/Events/ExportCompleteEvent.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Ardalis.GuardClauses;
-using Monai.Deploy.Messaging.Common;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -28,6 +28,7 @@ public class ExportCompleteEvent : EventBase
         /// Gets or sets the workflow instanceID generated by the Workflow Manager.
         /// </summary>
         [JsonProperty(PropertyName = "workflow_instance_id")]
+        [JsonPropertyName("workflow_instance_id")]
         [Required]
         public string WorkflowInstanceId { get; set; } = default!;
 
@@ -35,6 +36,7 @@ public class ExportCompleteEvent : EventBase
         /// Gets or sets the export task ID generated by the Workflow Manager.
         /// </summary>
         [JsonProperty(PropertyName = "export_task_id")]
+        [JsonPropertyName("export_task_id")]
         [Required]
         public string ExportTaskId { get; set; } = default!;
 
@@ -42,7 +44,9 @@ public class ExportCompleteEvent : EventBase
         /// Gets or sets the state of the export task.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonPropertyName("status")]
+        [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
+        [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))]
         [Required]
         public ExportStatus Status { get; set; }
 
@@ -50,15 +54,18 @@ public class ExportCompleteEvent : EventBase
         /// Gets or sets error messages, if any, when exporting.
         /// </summary>
         [JsonProperty(PropertyName = "message")]
+        [JsonPropertyName("message")]
         public string Message { get; set; } = default!;
 
         /// <summary>
         /// Gets or sets files exported with its status
         /// </summary>
         [JsonProperty(PropertyName = "file_statuses")]
+        [JsonPropertyName("file_statuses")]
         public Dictionary<string, FileExportStatus> FileStatuses { get; set; }
 
-        [JsonConstructor]
+        [Newtonsoft.Json.JsonConstructor]
+        [System.Text.Json.Serialization.JsonConstructor]
         public ExportCompleteEvent()
         {
             Status = ExportStatus.Unknown;
diff --git a/src/Messaging/Events/ExportRequestEvent.cs b/src/Messaging/Events/ExportRequestEvent.cs
index 2d6c89e..b5fd258 100755
--- a/src/Messaging/Events/ExportRequestEvent.cs
+++ b/src/Messaging/Events/ExportRequestEvent.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 using System.ComponentModel.DataAnnotations;
-using Monai.Deploy.Messaging.Common;
+using System.Text.Json.Serialization;
 using Newtonsoft.Json;
 
 namespace Monai.Deploy.Messaging.Events
@@ -26,6 +26,7 @@ public class ExportRequestEvent : EventBase
         /// Gets or sets the workflow instance ID generated by the Workflow Manager.
         /// </summary>
         [JsonProperty(PropertyName = "workflow_instance_id")]
+        [JsonPropertyName("workflow_instance_id")]
         [Required]
         public string WorkflowInstanceId { get; set; } = default!;
 
@@ -33,6 +34,7 @@ public class ExportRequestEvent : EventBase
         /// Gets or sets the export task ID generated by the Workflow Manager.
         /// </summary>
         [JsonProperty(PropertyName = "export_task_id")]
+        [JsonPropertyName("export_task_id")]
         [Required]
         public string ExportTaskId { get; set; } = default!;
 
@@ -40,6 +42,7 @@ public class ExportRequestEvent : EventBase
         /// Gets or sets a list of files to be exported.
         /// </summary>
         [JsonProperty(PropertyName = "files")]
+        [JsonPropertyName("files")]
         [Required, MinLength(1)]
         public IEnumerable<string> Files { get; set; } = default!;
 
@@ -49,6 +52,7 @@ public class ExportRequestEvent : EventBase
         /// For ACR, the Transaction ID in the original inference request.
         /// </summary>
         [JsonProperty(PropertyName = "destinations")]
+        [JsonPropertyName("destinations")]
         [Required]
         public string[] Destinations { get; set; } = default!;
 
@@ -58,22 +62,29 @@ public class ExportRequestEvent : EventBase
         /// For ACR, use the Transaction ID in the original request.
         /// </summary>
         [JsonProperty(PropertyName = "correlation_id")]
+        [JsonPropertyName("correlation_id")]
         [Required]
         public string CorrelationId { get; set; } = default!;
 
         /// <summary>
         /// Gets or sets the delivery tag or acknowledge token for the task.
         /// </summary>
+        [JsonProperty(PropertyName = "delivery_tag")]
+        [JsonPropertyName("delivery_tag")]
         public string DeliveryTag { get; set; } = default!;
 
         /// <summary>
         /// Gets or sets the message ID set by the message broker.
         /// </summary>
+        [JsonProperty(PropertyName = "message_id")]
+        [JsonPropertyName("message_id")]
         public string MessageId { get; set; } = default!;
 
         /// <summary>
         /// Gets or sets error messages related to this export task.
         /// </summary>
+        [JsonProperty(PropertyName = "error_messages")]
+        [JsonPropertyName("error_messages")]
         public List<string> ErrorMessages { get; private set; }
 
         /// <summary>
@@ -82,6 +93,8 @@ public class ExportRequestEvent : EventBase
         /// E.g. <code>MyCompnay.MyProject.MyNamepsace.MyPlugin, MyCompnay.MyProject.MyNamepsace</code> where
         /// <code>MyCompnay.MyProject.MyNamepsace</code> is the name of the assembly (DLL).
         /// </summary>
+        [JsonProperty(PropertyName = "plug_in_assemblies")]
+        [JsonPropertyName("plug_in_assemblies")]
         public List<string> PluginAssemblies { get; private set; }
 
         public ExportRequestEvent()
diff --git a/src/Messaging/Events/TaskCallbackEvent.cs b/src/Messaging/Events/TaskCallbackEvent.cs
index 0601b88..c088910 100644
--- a/src/Messaging/Events/TaskCallbackEvent.cs
+++ b/src/Messaging/Events/TaskCallbackEvent.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2022-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Monai.Deploy.Messaging.Common;
 using Newtonsoft.Json;
 
@@ -26,6 +27,7 @@ public class TaskCallbackEvent : EventBase
         /// Gets or sets the ID representing the instance of the workflow.
         /// </summary>
         [JsonProperty(PropertyName = "workflow_instance_id")]
+        [JsonPropertyName("workflow_instance_id")]
         [Required]
         public string WorkflowInstanceId { get; set; }
 
@@ -34,12 +36,14 @@ public class TaskCallbackEvent : EventBase
         /// </summary>
         [Required]
         [JsonProperty(PropertyName = "task_id")]
+        [JsonPropertyName("task_id")]
         public string TaskId { get; set; }
 
         /// <summary>
         /// Gets or sets the execution ID representing the instance of the task.
         /// </summary>
         [JsonProperty(PropertyName = "execution_id")]
+        [JsonPropertyName("execution_id")]
         [Required]
         public string ExecutionId { get; set; }
 
@@ -47,6 +51,7 @@ public class TaskCallbackEvent : EventBase
         /// Gets or sets the correlation ID.
         /// </summary>
         [JsonProperty(PropertyName = "correlation_id")]
+        [JsonPropertyName("correlation_id")]
         [Required]
         public string CorrelationId { get; set; }
 
@@ -54,6 +59,7 @@ public class TaskCallbackEvent : EventBase
         /// Gets or sets the identity provided by the external service.
         /// </summary>
         [JsonProperty(PropertyName = "identity")]
+        [JsonPropertyName("identity")]
         [Required]
         public string Identity { get; set; }
 
@@ -61,12 +67,14 @@ public class TaskCallbackEvent : EventBase
         /// Gets or sets any metadata generated by the task, including any output generated.
         /// </summary>
         [JsonProperty(PropertyName = "metadata")]
+        [JsonPropertyName("metadata")]
         public Dictionary<string, object> Metadata { get; set; }
 
         /// <summary>
         /// Gets or sets the output storage information.
         /// </summary>
         [JsonProperty(PropertyName = "outputs")]
+        [JsonPropertyName("outputs")]
         public List<Storage> Outputs { get; set; }
 
         public TaskCallbackEvent()
diff --git a/src/Messaging/Events/TaskCancellationEvent.cs b/src/Messaging/Events/TaskCancellationEvent.cs
index 8498384..aae9879 100644
--- a/src/Messaging/Events/TaskCancellationEvent.cs
+++ b/src/Messaging/Events/TaskCancellationEvent.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2022-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Monai.Deploy.Messaging.Events
 {
@@ -25,6 +27,7 @@ public class TaskCancellationEvent : EventBase
         /// Gets or sets the ID representing the instance of the workflow.
         /// </summary>
         [JsonProperty(PropertyName = "workflow_instance_id")]
+        [JsonPropertyName("workflow_instance_id")]
         [Required]
         public string WorkflowInstanceId { get; set; } = string.Empty;
 
@@ -32,6 +35,7 @@ public class TaskCancellationEvent : EventBase
         /// Gets or sets the execution ID representing the instance of the task.
         /// </summary>
         [JsonProperty(PropertyName = "execution_id")]
+        [JsonPropertyName("execution_id")]
         [Required]
         public string ExecutionId { get; set; } = string.Empty;
 
@@ -40,12 +44,14 @@ public class TaskCancellationEvent : EventBase
         /// </summary>
         [Required]
         [JsonProperty(PropertyName = "task_id")]
+        [JsonPropertyName("task_id")]
         public string TaskId { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the identity provided by the external service.
         /// </summary>
         [JsonProperty(PropertyName = "identity")]
+        [JsonPropertyName("identity")]
         [Required, MaxLength(63)]
         public string Identity { get; set; } = string.Empty;
 
@@ -53,6 +59,9 @@ public class TaskCancellationEvent : EventBase
         /// Gets or sets the reason for the cancellation.
         /// </summary>
         [JsonProperty(PropertyName = "reason")]
+        [JsonPropertyName("reason")]
+        [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
+        [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))]
         [Required]
         public FailureReason Reason { get; set; } = FailureReason.Unknown;
 
@@ -60,6 +69,7 @@ public class TaskCancellationEvent : EventBase
         /// Gets or sets a message relating to the cancellation.
         /// </summary>
         [JsonProperty(PropertyName = "message")]
+        [JsonPropertyName("message")]
         [Required, MaxLength(63)]
         public string Message { get; set; } = string.Empty;
     }
diff --git a/src/Messaging/Events/TaskDispatchEvent.cs b/src/Messaging/Events/TaskDispatchEvent.cs
index 726f7c3..c1aa168 100644
--- a/src/Messaging/Events/TaskDispatchEvent.cs
+++ b/src/Messaging/Events/TaskDispatchEvent.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2022-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Monai.Deploy.Messaging.Common;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -27,6 +28,7 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets the ID representing the instance of the workflow.
         /// </summary>
         [JsonProperty(PropertyName = "workflow_instance_id")]
+        [JsonPropertyName("workflow_instance_id")]
         [Required]
         public string WorkflowInstanceId { get; set; }
 
@@ -35,12 +37,14 @@ public class TaskDispatchEvent : EventBase
         /// </summary>
         [Required]
         [JsonProperty(PropertyName = "task_id")]
+        [JsonPropertyName("task_id")]
         public string TaskId { get; set; }
 
         /// <summary>
         /// Gets or sets the execution ID representing the instance of the task.
         /// </summary>
         [JsonProperty(PropertyName = "execution_id")]
+        [JsonPropertyName("execution_id")]
         [Required]
         public string ExecutionId { get; set; }
 
@@ -48,6 +52,7 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets the payload ID of the current workflow instance.
         /// </summary>
         [JsonProperty(PropertyName = "payload_id")]
+        [JsonPropertyName("payload_id")]
         [Required]
         public string PayloadId { get; set; }
 
@@ -55,6 +60,7 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets the correlation ID.
         /// </summary>
         [JsonProperty(PropertyName = "correlation_id")]
+        [JsonPropertyName("correlation_id")]
         [Required]
         public string CorrelationId { get; set; }
 
@@ -62,6 +68,7 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets the type of plug-in the task is associated with.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
+        [JsonPropertyName("type")]
         [Required]
         public string TaskPluginType { get; set; }
 
@@ -69,13 +76,16 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets the task execution arguments.
         /// </summary>
         [JsonProperty(PropertyName = "task_plugin_arguments")]
+        [JsonPropertyName("task_plugin_arguments")]
         public Dictionary<string, string> TaskPluginArguments { get; set; }
 
         /// <summary>
         /// Gets or set the status of the task.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonPropertyName("status")]
+        [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
+        [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))]
         [Required]
         public TaskExecutionStatus Status { get; set; }
 
@@ -83,6 +93,7 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets the input storage information.
         /// </summary>
         [JsonProperty(PropertyName = "inputs")]
+        [JsonPropertyName("inputs")]
         [Required, MinLength(1, ErrorMessage = "At least input is required.")]
         public List<Storage> Inputs { get; set; }
 
@@ -90,6 +101,7 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets the output storage information.
         /// </summary>
         [JsonProperty(PropertyName = "outputs")]
+        [JsonPropertyName("outputs")]
         [Required]
         public List<Storage> Outputs { get; set; }
 
@@ -97,6 +109,7 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets the intermediate storage information.
         /// </summary>
         [JsonProperty(PropertyName = "intermediate_storage")]
+        [JsonPropertyName("intermediate_storage")]
         [Required]
         public Storage IntermediateStorage { get; set; }
 
@@ -104,6 +117,7 @@ public class TaskDispatchEvent : EventBase
         /// Gets or sets any metadata relevant to the task.
         /// </summary>
         [JsonProperty(PropertyName = "metadata")]
+        [JsonPropertyName("metadata")]
         public Dictionary<string, object> Metadata { get; set; }
 
         public TaskDispatchEvent()
diff --git a/src/Messaging/Events/TaskUpdateEvent.cs b/src/Messaging/Events/TaskUpdateEvent.cs
index 2c2c9fb..b9ea839 100644
--- a/src/Messaging/Events/TaskUpdateEvent.cs
+++ b/src/Messaging/Events/TaskUpdateEvent.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2022-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Monai.Deploy.Messaging.Common;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -27,6 +28,7 @@ public class TaskUpdateEvent : EventBase
         /// Gets or sets the ID representing the instance of the workflow.
         /// </summary>
         [JsonProperty(PropertyName = "workflow_instance_id")]
+        [JsonPropertyName("workflow_instance_id")]
         [Required]
         public string WorkflowInstanceId { get; set; }
 
@@ -35,12 +37,14 @@ public class TaskUpdateEvent : EventBase
         /// </summary>
         [Required]
         [JsonProperty(PropertyName = "task_id")]
+        [JsonPropertyName("task_id")]
         public string TaskId { get; set; }
 
         /// <summary>
         /// Gets or sets the execution ID representing the instance of the task.
         /// </summary>
         [JsonProperty(PropertyName = "execution_id")]
+        [JsonPropertyName("execution_id")]
         [Required]
         public string ExecutionId { get; set; }
 
@@ -48,6 +52,7 @@ public class TaskUpdateEvent : EventBase
         /// Gets or sets the correlation ID.
         /// </summary>
         [JsonProperty(PropertyName = "correlation_id")]
+        [JsonPropertyName("correlation_id")]
         [Required]
         public string CorrelationId { get; set; }
 
@@ -55,7 +60,9 @@ public class TaskUpdateEvent : EventBase
         /// Gets or set the status of the task.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonPropertyName("status")]
+        [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
+        [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))]
         [Required]
         public TaskExecutionStatus Status { get; set; }
 
@@ -63,13 +70,16 @@ public class TaskUpdateEvent : EventBase
         /// Gets or set the execution stats of the task.
         /// </summary>
         [JsonProperty(PropertyName = "taskStats")]
+        [JsonPropertyName("taskStats")]
         public Dictionary<string, string> ExecutionStats { get; set; }
 
         /// <summary>
         /// Gets or set the failure reason of the task.
         /// </summary>
         [JsonProperty(PropertyName = "reason")]
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonPropertyName("reason")]
+        [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
+        [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))]
         [Required]
         public FailureReason Reason { get; set; }
 
@@ -77,18 +87,21 @@ public class TaskUpdateEvent : EventBase
         /// Gets or set any additional (error) message related to the task.
         /// </summary>
         [JsonProperty(PropertyName = "message")]
+        [JsonPropertyName("message")]
         public string Message { get; set; }
 
         /// <summary>
         /// Gets or sets any output artifacts relevent to the output of the task.
         /// </summary>
         [JsonProperty(PropertyName = "outputs")]
+        [JsonPropertyName("outputs")]
         public List<Storage> Outputs { get; set; }
 
         /// <summary>
         /// Gets or sets any metadata relevant to the output of the task.
         /// </summary>
         [JsonProperty(PropertyName = "metadata")]
+        [JsonPropertyName("metadata")]
         public Dictionary<string, object> Metadata { get; set; }
 
         public TaskUpdateEvent()
diff --git a/src/Messaging/Events/WorkflowRequestEvent.cs b/src/Messaging/Events/WorkflowRequestEvent.cs
index 3438f69..982b430 100755
--- a/src/Messaging/Events/WorkflowRequestEvent.cs
+++ b/src/Messaging/Events/WorkflowRequestEvent.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 using Monai.Deploy.Messaging.Common;
 using Newtonsoft.Json;
 
@@ -22,8 +23,9 @@ namespace Monai.Deploy.Messaging.Events
 {
     public class DataOrigin
     {
-        [JsonProperty(PropertyName = "type")]
-        public DataType DataType { get; set; }
+        [JsonProperty(PropertyName = "dataService")]
+        [JsonPropertyName("dataService")]
+        public DataService DataService { get; set; } = DataService.Unknown;
 
         /// <summary>
         /// Gets or sets the source of the data:
@@ -35,6 +37,7 @@ public class DataOrigin
         /// </list>
         /// </summary>
         [JsonProperty(PropertyName = "source")]
+        [JsonPropertyName("source")]
         [Required]
         public string Source { get; set; } = default!;
 
@@ -48,10 +51,28 @@ public class DataOrigin
         /// </list>
         /// </summary>
         [JsonProperty(PropertyName = "destination")]
+        [JsonPropertyName("destination")]
         public string Destination { get; set; } = default!;
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Source, Destination, DataService);
+        }
+
+        public override bool Equals(object? obj)
+        {
+            return obj is DataOrigin dataOrigin &&
+                Source.Equals(dataOrigin.Source, StringComparison.Ordinal) &&
+                Destination.Equals(dataOrigin.Destination, StringComparison.Ordinal) &&
+                DataService.Equals(dataOrigin.DataService);
+        }
     }
-    public enum DataType
+    public enum DataService
     {
+        /// <summary>
+        /// Unknown data service
+        /// </summary>
+        Unknown,
         /// <summary>
         /// Data received via DIMSE services
         /// </summary>
@@ -59,7 +80,7 @@ public enum DataType
         /// <summary>
         /// Data received via DICOMWeb services
         /// </summary>
-        DICOMWEB,
+        DicomWeb,
         /// <summary>
         /// Data received via FHIR services
         /// </summary>
@@ -68,6 +89,10 @@ public enum DataType
         /// Data received via HL7 services
         /// </summary>
         HL7,
+        /// <summary>
+        /// Data received via ACR API call
+        /// </summary>
+        ACR,
     }
 
     public class WorkflowRequestEvent : EventBase
@@ -78,6 +103,7 @@ public class WorkflowRequestEvent : EventBase
         /// Gets or sets the ID of the payload which is also used as the root path of the payload.
         /// </summary>
         [JsonProperty(PropertyName = "payload_id")]
+        [JsonPropertyName("payload_id")]
         [Required]
         public Guid PayloadId { get; set; }
 
@@ -85,12 +111,14 @@ public class WorkflowRequestEvent : EventBase
         /// Gets or sets the associated workflows to be launched.
         /// </summary>
         [JsonProperty(PropertyName = "workflows")]
+        [JsonPropertyName("workflows")]
         public IEnumerable<string> Workflows { get; set; }
 
         /// <summary>
         /// Gets or sets number of files in the payload.
         /// </summary>
         [JsonProperty(PropertyName = "file_count")]
+        [JsonPropertyName("file_count")]
         [Required]
         public int FileCount { get; set; }
 
@@ -99,6 +127,7 @@ public class WorkflowRequestEvent : EventBase
         /// For an ACR inference request, the correlation ID is the Transaction ID in the original request.
         /// </summary>
         [JsonProperty(PropertyName = "correlation_id")]
+        [JsonPropertyName("correlation_id")]
         [Required]
         public string CorrelationId { get; set; } = default!;
 
@@ -106,6 +135,7 @@ public class WorkflowRequestEvent : EventBase
         /// Gets or set the name of the bucket where the files in are stored.
         /// </summary>
         [JsonProperty(PropertyName = "bucket")]
+        [JsonPropertyName("bucket")]
         [Required]
         public string Bucket { get; set; } = default!;
 
@@ -113,18 +143,21 @@ public class WorkflowRequestEvent : EventBase
         /// Gets or sets the service that received the original request.
         /// </summary>
         [JsonProperty(PropertyName = "trigger")]
+        [JsonPropertyName("trigger")]
         public DataOrigin DataTrigger { get; set; } = default!;
 
         /// <summary>
         /// Gets or sets the data origins that were involved in triggering this workflow request.
         /// </summary>
         [JsonProperty(PropertyName = "data_origins")]
+        [JsonPropertyName("data_origins")]
         public List<DataOrigin> DataOrigins { get; private set; }
 
         /// <summary>
         /// Gets or sets the time the data was received.
         /// </summary>
         [JsonProperty(PropertyName = "timestamp")]
+        [JsonPropertyName("timestamp")]
         [Required]
         public DateTime Timestamp { get; set; }
 
@@ -134,6 +167,7 @@ public class WorkflowRequestEvent : EventBase
         /// In standard workflows this will not be set
         /// </summary>
         [JsonProperty(PropertyName = "workflow_instance_id")]
+        [JsonPropertyName("workflow_instance_id")]
         public string? WorkflowInstanceId { get; set; } = default;
 
         /// <summary>
@@ -142,6 +176,7 @@ public class WorkflowRequestEvent : EventBase
         /// In standard workflows this will not be set
         /// </summary>
         [JsonProperty(PropertyName = "task_id")]
+        [JsonPropertyName("task_id")]
         public string? TaskId { get; set; } = default;
 
         /// <summary>
@@ -149,6 +184,7 @@ public class WorkflowRequestEvent : EventBase
         /// </summary>
         [JsonProperty(PropertyName = "payload")]
         [Required, MinLength(1, ErrorMessage = "At least one file is required.")]
+        [JsonPropertyName("payload")]
         public IReadOnlyList<BlockStorageInfo> Payload { get => _payload; }
 
         public WorkflowRequestEvent()
diff --git a/src/Messaging/Monai.Deploy.Messaging.csproj b/src/Messaging/Monai.Deploy.Messaging.csproj
index 4c5df90..3d8f483 100644
--- a/src/Messaging/Monai.Deploy.Messaging.csproj
+++ b/src/Messaging/Monai.Deploy.Messaging.csproj
@@ -22,6 +22,7 @@
     <Nullable>enable</Nullable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-messagingcsharp.ruleset</CodeAnalysisRuleSet>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Messaging/Tests/WorkflowRequestMessageTest.cs b/src/Messaging/Tests/WorkflowRequestMessageTest.cs
index 517d478..22a3553 100644
--- a/src/Messaging/Tests/WorkflowRequestMessageTest.cs
+++ b/src/Messaging/Tests/WorkflowRequestMessageTest.cs
@@ -32,7 +32,7 @@ public void ConvertsJsonMessageToMessage()
                 Bucket = Guid.NewGuid().ToString(),
                 DataTrigger = new DataOrigin
                 {
-                    DataType = DataType.DIMSE,
+                    DataService = DataService.DIMSE,
                     Source = Guid.NewGuid().ToString(),
                     Destination = Guid.NewGuid().ToString(),
                 },
@@ -46,28 +46,28 @@ public void ConvertsJsonMessageToMessage()
             };
             input.DataOrigins.Add(new DataOrigin
             {
-                DataType = DataType.DICOMWEB,
+                DataService = DataService.DicomWeb,
                 Source = Guid.NewGuid().ToString(),
                 Destination = Guid.NewGuid().ToString(),
 
             });
             input.DataOrigins.Add(new DataOrigin
             {
-                DataType = DataType.FHIR,
+                DataService = DataService.FHIR,
                 Source = Guid.NewGuid().ToString(),
                 Destination = Guid.NewGuid().ToString(),
 
             });
             input.DataOrigins.Add(new DataOrigin
             {
-                DataType = DataType.DIMSE,
+                DataService = DataService.DIMSE,
                 Source = Guid.NewGuid().ToString(),
                 Destination = Guid.NewGuid().ToString(),
 
             });
             input.DataOrigins.Add(new DataOrigin
             {
-                DataType = DataType.HL7,
+                DataService = DataService.HL7,
                 Source = Guid.NewGuid().ToString(),
                 Destination = Guid.NewGuid().ToString(),
 
diff --git a/src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj b/src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj
index 4628a97..a8b20e4 100644
--- a/src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj
+++ b/src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj
@@ -23,6 +23,7 @@
     <RootNamespace>Monai.Deploy.Messaging.RabbitMQ</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup>