diff --git a/app/MindWork AI Studio/Chat/ChatThread.cs b/app/MindWork AI Studio/Chat/ChatThread.cs
index 7ecb6a20..7bfa943e 100644
--- a/app/MindWork AI Studio/Chat/ChatThread.cs	
+++ b/app/MindWork AI Studio/Chat/ChatThread.cs	
@@ -3,29 +3,35 @@ namespace AIStudio.Chat;
 /// <summary>
 /// Data structure for a chat thread.
 /// </summary>
-/// <param name="name">The name of the chat thread.</param>
-/// <param name="seed">The seed for the chat thread. Some providers use this to generate deterministic results.</param>
-/// <param name="systemPrompt">The system prompt for the chat thread.</param>
-/// <param name="blocks">The content blocks of the chat thread.</param>
-public sealed class ChatThread(string name, int seed, string systemPrompt, IEnumerable<ContentBlock> blocks)
+public sealed class ChatThread
 {
+    /// <summary>
+    /// The unique identifier of the chat thread.
+    /// </summary>
+    public Guid ChatId { get; init; }
+    
+    /// <summary>
+    /// The unique identifier of the workspace.
+    /// </summary>
+    public Guid WorkspaceId { get; set; }
+
     /// <summary>
     /// The name of the chat thread. Usually generated by an AI model or manually edited by the user.
     /// </summary>
-    public string Name { get; set; } = name;
+    public string Name { get; init; } = string.Empty;
 
     /// <summary>
     /// The seed for the chat thread. Some providers use this to generate deterministic results.
     /// </summary>
-    public int Seed { get; set; } = seed;
+    public int Seed { get; init; }
     
     /// <summary>
     /// The current system prompt for the chat thread.
     /// </summary>
-    public string SystemPrompt { get; set; } = systemPrompt;
-    
+    public string SystemPrompt { get; init; } = string.Empty;
+
     /// <summary>
     /// The content blocks of the chat thread.
     /// </summary>
-    public List<ContentBlock> Blocks { get; init; } = blocks.ToList();
+    public List<ContentBlock> Blocks { get; init; } = [];
 }
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Chat/ContentBlock.cs b/app/MindWork AI Studio/Chat/ContentBlock.cs
index 65e1f290..05a6bd1f 100644
--- a/app/MindWork AI Studio/Chat/ContentBlock.cs	
+++ b/app/MindWork AI Studio/Chat/ContentBlock.cs	
@@ -3,25 +3,22 @@ namespace AIStudio.Chat;
 /// <summary>
 /// A block of content in a chat thread. Might be any type of content, e.g., text, image, voice, etc.
 /// </summary>
-/// <param name="time">Time when the content block was created.</param>
-/// <param name="type">Type of the content block, e.g., text, image, voice, etc.</param>
-/// <param name="content">The content of the block.</param>
-public class ContentBlock(DateTimeOffset time, ContentType type, IContent content)
+public class ContentBlock
 {
     /// <summary>
     /// Time when the content block was created.
     /// </summary>
-    public DateTimeOffset Time => time;
+    public DateTimeOffset Time { get; init; }
     
     /// <summary>
     /// Type of the content block, e.g., text, image, voice, etc.
     /// </summary>
-    public ContentType ContentType => type;
+    public ContentType ContentType { get; init; } = ContentType.NONE;
     
     /// <summary>
     /// The content of the block.
     /// </summary>
-    public IContent Content => content;
+    public IContent? Content { get; init; } = null;
 
     /// <summary>
     /// The role of the content block in the chat thread, e.g., user, AI, etc.
diff --git a/app/MindWork AI Studio/Chat/ContentImage.cs b/app/MindWork AI Studio/Chat/ContentImage.cs
index 247c4848..9afe4476 100644
--- a/app/MindWork AI Studio/Chat/ContentImage.cs	
+++ b/app/MindWork AI Studio/Chat/ContentImage.cs	
@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 using AIStudio.Provider;
 using AIStudio.Settings;
 
@@ -11,15 +13,19 @@ public sealed class ContentImage : IContent
     #region Implementation of IContent
 
     /// <inheritdoc />
+    [JsonIgnore]
     public bool InitialRemoteWait { get; set; } = false;
 
     /// <inheritdoc />
+    [JsonIgnore]
     public bool IsStreaming { get; set; } = false;
 
     /// <inheritdoc />
+    [JsonIgnore]
     public Func<Task> StreamingDone { get; set; } = () => Task.CompletedTask;
 
     /// <inheritdoc />
+    [JsonIgnore]
     public Func<Task> StreamingEvent { get; set; } = () => Task.CompletedTask;
 
     /// <inheritdoc />
diff --git a/app/MindWork AI Studio/Chat/ContentText.cs b/app/MindWork AI Studio/Chat/ContentText.cs
index 24c7b63b..f125d4b7 100644
--- a/app/MindWork AI Studio/Chat/ContentText.cs	
+++ b/app/MindWork AI Studio/Chat/ContentText.cs	
@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 using AIStudio.Provider;
 using AIStudio.Settings;
 
@@ -17,14 +19,19 @@ public sealed class ContentText : IContent
     #region Implementation of IContent
 
     /// <inheritdoc />
+    [JsonIgnore]
     public bool InitialRemoteWait { get; set; }
 
     /// <inheritdoc />
+    // [JsonIgnore]
     public bool IsStreaming { get; set; }
 
     /// <inheritdoc />
+    [JsonIgnore]
     public Func<Task> StreamingDone { get; set; } = () => Task.CompletedTask;
 
+    /// <inheritdoc />
+    [JsonIgnore]
     public Func<Task> StreamingEvent { get; set; } = () => Task.CompletedTask;
 
     /// <inheritdoc />
diff --git a/app/MindWork AI Studio/Chat/IContent.cs b/app/MindWork AI Studio/Chat/IContent.cs
index e8dcd4d6..8f6bc0ad 100644
--- a/app/MindWork AI Studio/Chat/IContent.cs	
+++ b/app/MindWork AI Studio/Chat/IContent.cs	
@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 using AIStudio.Provider;
 using AIStudio.Settings;
 
@@ -6,6 +8,8 @@ namespace AIStudio.Chat;
 /// <summary>
 /// The interface for any content in the chat.
 /// </summary>
+[JsonDerivedType(typeof(ContentText), typeDiscriminator: "text")]
+[JsonDerivedType(typeof(ContentImage), typeDiscriminator: "image")]
 public interface IContent
 {
     /// <summary>
@@ -13,22 +17,26 @@ public interface IContent
     /// Does not indicate that the stream is finished; it only indicates that we are
     /// waiting for the first response, i.e., wait for the remote to pick up the request.
     /// </summary>
+    [JsonIgnore]
     public bool InitialRemoteWait { get; set; }
 
     /// <summary>
     /// Indicates whether the content is streaming right now. False, if the content is
     /// either static or the stream has finished.
     /// </summary>
+    [JsonIgnore]
     public bool IsStreaming { get; set; }
 
     /// <summary>
     /// An action that is called when the content was changed during streaming.
     /// </summary>
+    [JsonIgnore]
     public Func<Task> StreamingEvent { get; set; }
 
     /// <summary>
     /// An action that is called when the streaming is done.
     /// </summary>
+    [JsonIgnore]
     public Func<Task> StreamingDone { get; set; }
     
     /// <summary>