diff --git a/app/MindWork AI Studio/Provider/Groq/ChatRequest.cs b/app/MindWork AI Studio/Provider/Groq/ChatRequest.cs
deleted file mode 100644
index 07ddce22..00000000
--- a/app/MindWork AI Studio/Provider/Groq/ChatRequest.cs	
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace AIStudio.Provider.Groq;
-
-/// <summary>
-/// The Groq chat request model.
-/// </summary>
-/// <param name="Model">Which model to use for chat completion.</param>
-/// <param name="Messages">The chat messages.</param>
-/// <param name="Stream">Whether to stream the chat completion.</param>
-/// <param name="Seed">The seed for the chat completion.</param>
-public readonly record struct ChatRequest(
-    string Model,
-    IList<IMessageBase> Messages,
-    bool Stream,
-    [property: JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    int? Seed
-)
-{
-    // Attention: The "required" modifier is not supported for [JsonExtensionData].
-    [JsonExtensionData]
-    public IDictionary<string, object> AdditionalApiParameters { get; init; } = new Dictionary<string, object>();
-}
diff --git a/app/MindWork AI Studio/Provider/Groq/ProviderGroq.cs b/app/MindWork AI Studio/Provider/Groq/ProviderGroq.cs
index a3ca862d..d36951f0 100644
--- a/app/MindWork AI Studio/Provider/Groq/ProviderGroq.cs	
+++ b/app/MindWork AI Studio/Provider/Groq/ProviderGroq.cs	
@@ -22,19 +22,20 @@ public class ProviderGroq() : BaseProvider(LLMProviders.GROQ, "https://api.groq.
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatRequest, ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>(
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, ChatCompletionAnnotationStreamLine>(
                            "Groq",
                            chatModel,
                            chatThread,
                            settingsManager,
                            async (systemPrompt, apiParameters) =>
                            {
-                               var seed = TryPopIntParameter(apiParameters, "seed", out var parsedSeed) ? parsedSeed : (int?)null;
+                               if (TryPopIntParameter(apiParameters, "seed", out var parsedSeed))
+                                   apiParameters["seed"] = parsedSeed;
 
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingNestedImageUrlAsync(this.Provider, chatModel);
 
-                               return new ChatRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -45,7 +46,6 @@ public class ProviderGroq() : BaseProvider(LLMProviders.GROQ, "https://api.groq.
 
                                    // Right now, we only support streaming completions:
                                    Stream = true,
-                                   Seed = seed,
                                    AdditionalApiParameters = apiParameters
                                };
                            },
diff --git a/app/MindWork AI Studio/Provider/Mistral/ChatRequest.cs b/app/MindWork AI Studio/Provider/Mistral/ChatRequest.cs
deleted file mode 100644
index 1d42081f..00000000
--- a/app/MindWork AI Studio/Provider/Mistral/ChatRequest.cs	
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace AIStudio.Provider.Mistral;
-
-/// <summary>
-/// The OpenAI chat request model.
-/// </summary>
-/// <param name="Model">Which model to use for chat completion.</param>
-/// <param name="Messages">The chat messages.</param>
-/// <param name="Stream">Whether to stream the chat completion.</param>
-/// <param name="RandomSeed">The seed for the chat completion.</param>
-/// <param name="SafePrompt">Whether to inject a safety prompt before all conversations.</param>
-public readonly record struct ChatRequest(
-    string Model,
-    IList<IMessageBase> Messages,
-    bool Stream,
-    [property: JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    int? RandomSeed,
-    bool SafePrompt = false
-)
-{
-    // Attention: The "required" modifier is not supported for [JsonExtensionData].
-    [JsonExtensionData]
-    public IDictionary<string, object> AdditionalApiParameters { get; init; } = new Dictionary<string, object>();
-}
diff --git a/app/MindWork AI Studio/Provider/Mistral/ProviderMistral.cs b/app/MindWork AI Studio/Provider/Mistral/ProviderMistral.cs
index b40f6657..e4445300 100644
--- a/app/MindWork AI Studio/Provider/Mistral/ProviderMistral.cs	
+++ b/app/MindWork AI Studio/Provider/Mistral/ProviderMistral.cs	
@@ -20,20 +20,23 @@ public sealed class ProviderMistral() : BaseProvider(LLMProviders.MISTRAL, "http
     /// <inheritdoc />
     public override async IAsyncEnumerable<ContentStreamChunk> StreamChatCompletion(Provider.Model chatModel, ChatThread chatThread, SettingsManager settingsManager, [EnumeratorCancellation] CancellationToken token = default)
     {
-        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatRequest, ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>(
+        await foreach (var content in this.StreamOpenAICompatibleChatCompletion<ChatCompletionAPIRequest, ChatCompletionDeltaStreamLine, NoChatCompletionAnnotationStreamLine>(
                            "Mistral",
                            chatModel,
                            chatThread,
                            settingsManager,
                            async (systemPrompt, apiParameters) =>
                            {
-                               var safePrompt = TryPopBoolParameter(apiParameters, "safe_prompt", out var parsedSafePrompt) && parsedSafePrompt;
-                               var randomSeed = TryPopIntParameter(apiParameters, "random_seed", out var parsedRandomSeed) ? parsedRandomSeed : (int?)null;
+                               if (TryPopBoolParameter(apiParameters, "safe_prompt", out var parsedSafePrompt))
+                                   apiParameters["safe_prompt"] = parsedSafePrompt;
+
+                               if (TryPopIntParameter(apiParameters, "random_seed", out var parsedRandomSeed))
+                                   apiParameters["random_seed"] = parsedRandomSeed;
 
                                // Build the list of messages:
                                var messages = await chatThread.Blocks.BuildMessagesUsingDirectImageUrlAsync(this.Provider, chatModel);
 
-                               return new ChatRequest
+                               return new ChatCompletionAPIRequest
                                {
                                    Model = chatModel.Id,
 
@@ -44,8 +47,6 @@ public sealed class ProviderMistral() : BaseProvider(LLMProviders.MISTRAL, "http
 
                                    // Right now, we only support streaming completions:
                                    Stream = true,
-                                   RandomSeed = randomSeed,
-                                   SafePrompt = safePrompt,
                                    AdditionalApiParameters = apiParameters
                                };
                            },