diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs
index a485a9c4..eb5adacd 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/Conversation.cs
@@ -58,13 +58,17 @@ public class DialogElement
     [JsonPropertyName("payload")]
     public string? Payload { get; set; }
 
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("data")]
+    public object? Data { get; set; }
+
     public DialogElement()
     {
 
     }
 
     public DialogElement(DialogMetaData meta, string content, string? richContent = null,
-        string? secondaryContent = null, string? secondaryRichContent = null, string? payload = null)
+        string? secondaryContent = null, string? secondaryRichContent = null, string? payload = null, object? data = null)
     {
         MetaData = meta;
         Content = content;
@@ -72,6 +76,7 @@ public class DialogElement
         SecondaryContent = secondaryContent;
         SecondaryRichContent = secondaryRichContent;
         Payload = payload;
+        Data = data;
     }
 
     public override string ToString()
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
index f9ba5b12..1836ef23 100644
--- a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
+++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStorage.cs
@@ -52,7 +52,8 @@ public class ConversationStorage : IConversationStorage
                 MetaData = meta,
                 Content = dialog.Content,
                 SecondaryContent = dialog.SecondaryContent,
-                Payload = dialog.Payload
+                Payload = dialog.Payload,
+                Data = dialog.Data
             });
         }
         else
@@ -83,7 +84,8 @@ public class ConversationStorage : IConversationStorage
                 SecondaryContent = dialog.SecondaryContent,
                 RichContent = richContent,
                 SecondaryRichContent = secondaryRichContent,
-                Payload = dialog.Payload
+                Payload = dialog.Payload,
+                Data = dialog.Data
             });
         }
 
@@ -121,7 +123,8 @@ public class ConversationStorage : IConversationStorage
                     MetaData = meta,
                     Content = dialog.Content,
                     SecondaryContent = dialog.SecondaryContent,
-                    Payload = dialog.Payload
+                    Payload = dialog.Payload,
+                    Data = dialog.Data
                 });
             }
             else
@@ -152,7 +155,8 @@ public class ConversationStorage : IConversationStorage
                     SecondaryContent = dialog.SecondaryContent,
                     RichContent = richContent,
                     SecondaryRichContent = secondaryRichContent,
-                    Payload = dialog.Payload
+                    Payload = dialog.Payload,
+                    Data = dialog.Data
                 });
             }
         }
@@ -196,7 +200,8 @@ public class ConversationStorage : IConversationStorage
                 RichContent = richContent,
                 SecondaryContent = secondaryContent,
                 SecondaryRichContent = secondaryRichContent,
-                Payload = payload
+                Payload = payload,
+                Data = dialog.Data
             };
             results.Add(record);
 
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
index 2a7a48f8..f41c69fe 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
@@ -79,9 +79,8 @@ public class ConversationController : ControllerBase
     [HttpGet("/conversation/{conversationId}/dialogs")]
     public async Task<IEnumerable<ChatResponseModel>> GetDialogs([FromRoute] string conversationId)
     {
-        var conv = _services.GetRequiredService<IConversationService>();
-        conv.SetConversationId(conversationId, new List<MessageState>(), isReadOnly: true);
-        var history = conv.GetDialogHistory(fromBreakpoint: false);
+        var storage = _services.GetRequiredService<IConversationStorage>();
+        var history = storage.GetDialogs(conversationId);
 
         var userService = _services.GetRequiredService<IUserService>();
         var agentService = _services.GetRequiredService<IAgentService>();
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Models/DialogMongoElement.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Models/DialogMongoElement.cs
index 126dfee8..643806a5 100644
--- a/src/Plugins/BotSharp.Plugin.MongoStorage/Models/DialogMongoElement.cs
+++ b/src/Plugins/BotSharp.Plugin.MongoStorage/Models/DialogMongoElement.cs
@@ -11,6 +11,7 @@ public class DialogMongoElement
     public string? RichContent { get; set; }
     public string? SecondaryRichContent { get; set; }
     public string? Payload { get; set; }
+    public object? Data { get; set; }
 
     public DialogMongoElement()
     {
@@ -26,7 +27,8 @@ public class DialogMongoElement
             SecondaryContent = dialog.SecondaryContent,
             RichContent = dialog.RichContent,
             SecondaryRichContent = dialog.SecondaryRichContent,
-            Payload = dialog.Payload
+            Payload = dialog.Payload,
+            Data = dialog.Data
         };
     }
 
@@ -39,7 +41,8 @@ public class DialogMongoElement
             SecondaryContent = dialog.SecondaryContent,
             RichContent = dialog.RichContent,
             SecondaryRichContent = dialog.SecondaryRichContent,
-            Payload = dialog.Payload
+            Payload = dialog.Payload,
+            Data = dialog.Data
         };
     }
 }