diff --git a/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs
index 7153efe..6e1c4d5 100644
--- a/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Agenda/AssistantAgenda.razor.cs	
@@ -1,7 +1,6 @@
 using System.Text;
 
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.Agenda;
diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor b/app/MindWork AI Studio/Assistants/AssistantBase.razor
index 21d9284..634b55e 100644
--- a/app/MindWork AI Studio/Assistants/AssistantBase.razor	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor	
@@ -1,4 +1,5 @@
 @using AIStudio.Chat
+@inherits AssistantLowerBase
 @typeparam TSettings
 
 <div class="inner-scrolling-context">
diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs
index 4fd10eb..7c42e0a 100644
--- a/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor.cs	
@@ -1,6 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
-using AIStudio.Dialogs.Settings;
 using AIStudio.Provider;
 using AIStudio.Settings;
 using AIStudio.Tools.Services;
@@ -15,7 +13,7 @@ using DialogOptions = AIStudio.Dialogs.DialogOptions;
 
 namespace AIStudio.Assistants;
 
-public abstract partial class AssistantBase<TSettings> : ComponentBase, IMessageBusReceiver, IDisposable where TSettings : IComponent
+public abstract partial class AssistantBase<TSettings> : AssistantLowerBase, IMessageBusReceiver, IDisposable where TSettings : IComponent
 {
     [Inject]
     protected SettingsManager SettingsManager { get; init; } = null!;
@@ -35,9 +33,6 @@ public abstract partial class AssistantBase<TSettings> : ComponentBase, IMessage
     [Inject]
     protected RustService RustService { get; init; } = null!;
     
-    [Inject]
-    protected DataSourceService DataSourceService { get; init; } = null!;
-    
     [Inject]
     protected NavigationManager NavigationManager { get; init; } = null!;
     
@@ -50,10 +45,6 @@ public abstract partial class AssistantBase<TSettings> : ComponentBase, IMessage
     [Inject]
     private MessageBus MessageBus { get; init; } = null!;
     
-    internal const string RESULT_DIV_ID = "assistantResult";
-    internal const string BEFORE_RESULT_DIV_ID = "beforeAssistantResult";
-    internal const string AFTER_RESULT_DIV_ID = "afterAssistantResult";
-    
     protected abstract string Title { get; }
     
     protected abstract string Description { get; }
@@ -99,8 +90,6 @@ public abstract partial class AssistantBase<TSettings> : ComponentBase, IMessage
     protected virtual ChatThread ConvertToChatThread => this.chatThread ?? new();
 
     protected virtual IReadOnlyList<IButtonData> FooterButtons => [];
-
-    protected static readonly Dictionary<string, object?> USER_INPUT_ATTRIBUTES = new();
     
     protected AIStudio.Settings.Provider providerSettings;
     protected MudForm? form;
diff --git a/app/MindWork AI Studio/Assistants/AssistantLowerBase.cs b/app/MindWork AI Studio/Assistants/AssistantLowerBase.cs
new file mode 100644
index 0000000..8e05301
--- /dev/null
+++ b/app/MindWork AI Studio/Assistants/AssistantLowerBase.cs	
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Components;
+
+namespace AIStudio.Assistants;
+
+public abstract class AssistantLowerBase : ComponentBase
+{
+    protected static readonly Dictionary<string, object?> USER_INPUT_ATTRIBUTES = new();
+    
+    internal const string RESULT_DIV_ID = "assistantResult";
+    internal const string BEFORE_RESULT_DIV_ID = "beforeAssistantResult";
+    internal const string AFTER_RESULT_DIV_ID = "afterAssistantResult";
+}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Assistants/BiasDay/BiasOfTheDayAssistant.razor.cs b/app/MindWork AI Studio/Assistants/BiasDay/BiasOfTheDayAssistant.razor.cs
index c83b509..9435639 100644
--- a/app/MindWork AI Studio/Assistants/BiasDay/BiasOfTheDayAssistant.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/BiasDay/BiasOfTheDayAssistant.razor.cs	
@@ -1,7 +1,6 @@
 using System.Text;
 
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 using AIStudio.Settings.DataModel;
 
diff --git a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs
index aecb93c..61e9486 100644
--- a/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Coding/AssistantCoding.razor.cs	
@@ -1,5 +1,5 @@
 using System.Text;
-using AIStudio.Components.Settings;
+
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.Coding;
diff --git a/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs b/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs
index 48dc194..7a91f1c 100644
--- a/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/EMail/AssistantEMail.razor.cs	
@@ -1,7 +1,6 @@
 using System.Text;
 
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.EMail;
diff --git a/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs b/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs
index d86dcda..c752f4c 100644
--- a/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs	
@@ -2,7 +2,6 @@ using System.Text;
 using System.Text.RegularExpressions;
 
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs;
 using AIStudio.Dialogs.Settings;
 using AIStudio.Settings.DataModel;
diff --git a/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs
index 97742c2..4a0e53c 100644
--- a/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/GrammarSpelling/AssistantGrammarSpelling.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.GrammarSpelling;
diff --git a/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs
index ef518ba..a071a81 100644
--- a/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/IconFinder/AssistantIconFinder.razor.cs	
@@ -1,4 +1,3 @@
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.IconFinder;
diff --git a/app/MindWork AI Studio/Assistants/JobPosting/AssistantJobPostings.razor.cs b/app/MindWork AI Studio/Assistants/JobPosting/AssistantJobPostings.razor.cs
index 4834c67..651824d 100644
--- a/app/MindWork AI Studio/Assistants/JobPosting/AssistantJobPostings.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/JobPosting/AssistantJobPostings.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.JobPosting;
diff --git a/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs b/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs
index 7e8bf22..218563f 100644
--- a/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/LegalCheck/AssistantLegalCheck.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.LegalCheck;
diff --git a/app/MindWork AI Studio/Assistants/MyTasks/AssistantMyTasks.razor.cs b/app/MindWork AI Studio/Assistants/MyTasks/AssistantMyTasks.razor.cs
index 7be85b2..3a51261 100644
--- a/app/MindWork AI Studio/Assistants/MyTasks/AssistantMyTasks.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/MyTasks/AssistantMyTasks.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 using AIStudio.Settings;
 
diff --git a/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs
index 440a4e7..0fb4508 100644
--- a/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/RewriteImprove/AssistantRewriteImprove.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.RewriteImprove;
diff --git a/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs
index d0df48c..c5fc437 100644
--- a/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/TextSummarizer/AssistantTextSummarizer.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.TextSummarizer;
diff --git a/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs
index c29a862..628190c 100644
--- a/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Translation/AssistantTranslation.razor.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Chat;
-using AIStudio.Components.Settings;
 using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Assistants.Translation;
diff --git a/app/MindWork AI Studio/Components/ProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs
index be84e29..6615821 100644
--- a/app/MindWork AI Studio/Components/ProviderSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs	
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
 using AIStudio.Assistants;
-using AIStudio.Dialogs.Settings;
 using AIStudio.Provider;
 using AIStudio.Settings;
 
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAgenda.razor.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAgenda.razor.cs
index 94333b7..261d6b3 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAgenda.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAgenda.razor.cs	
@@ -1,5 +1,3 @@
-using AIStudio.Dialogs.Settings;
-
 namespace AIStudio.Dialogs.Settings;
 
 public partial class SettingsDialogAgenda : SettingsDialogBase;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAssistantBias.razor.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAssistantBias.razor.cs
index 19fbafc..7576704 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAssistantBias.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogAssistantBias.razor.cs	
@@ -1,7 +1,3 @@
-using AIStudio.Dialogs;
-
-using DialogOptions = AIStudio.Dialogs.DialogOptions;
-
 namespace AIStudio.Dialogs.Settings;
 
 public partial class SettingsDialogAssistantBias : SettingsDialogBase
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs
index f788148..430d61d 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs	
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
+
 using AIStudio.Settings;
-using AIStudio.Tools.Services;
 
 using Microsoft.AspNetCore.Components;
 
@@ -24,8 +23,6 @@ public abstract class SettingsDialogBase : ComponentBase
     [Inject]
     protected MessageBus MessageBus { get; init; } = null!;
     
-    [Inject]
-    protected RustService RustService { get; init; } = null!;
     
     #region Overrides of ComponentBase
 
diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogTranslation.razor.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogTranslation.razor.cs
index 83c8a29..1dc31ea 100644
--- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogTranslation.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogTranslation.razor.cs	
@@ -1,5 +1,3 @@
-using AIStudio.Dialogs.Settings;
-
 namespace AIStudio.Dialogs.Settings;
 
 public partial class SettingsDialogTranslation : SettingsDialogBase;
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs b/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs
index e00cf16..702d273 100644
--- a/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs	
+++ b/app/MindWork AI Studio/Tools/JsRuntimeExtensions.cs	
@@ -1,5 +1,4 @@
 using AIStudio.Assistants;
-using AIStudio.Dialogs.Settings;
 
 namespace AIStudio.Tools;
 
@@ -7,7 +6,7 @@ public static class JsRuntimeExtensions
 {
     public static async Task GenerateAndShowDiff(this IJSRuntime jsRuntime, string text1, string text2)
     {
-        await jsRuntime.InvokeVoidAsync("generateDiff", text1, text2, AssistantBase<NoComponent>.RESULT_DIV_ID, AssistantBase<NoComponent>.BEFORE_RESULT_DIV_ID);
+        await jsRuntime.InvokeVoidAsync("generateDiff", text1, text2, AssistantLowerBase.RESULT_DIV_ID, AssistantLowerBase.BEFORE_RESULT_DIV_ID);
     }
     
     public static async Task ClearDiv(this IJSRuntime jsRuntime, string divId)