diff --git a/cli/Squidex.CLI/Directory.Build.props b/cli/Squidex.CLI/Directory.Build.props
index 836ab765..472b1be7 100644
--- a/cli/Squidex.CLI/Directory.Build.props
+++ b/cli/Squidex.CLI/Directory.Build.props
@@ -15,6 +15,6 @@
     <PackageTags>Squidex HeadlessCMS</PackageTags>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>9.6</Version>
+    <Version>10.0</Version>
   </PropertyGroup>
 </Project>
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ISession.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ISession.cs
index 6a16d9e7..5519e848 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ISession.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ISession.cs
@@ -6,7 +6,6 @@
 // ==========================================================================
 
 using Squidex.ClientLibrary;
-using Squidex.ClientLibrary.Management;
 
 namespace Squidex.CLI.Commands.Implementation;
 
@@ -22,17 +21,5 @@ public interface ISession
 
     DirectoryInfo WorkingDirectory { get; }
 
-    IAppsClient Apps { get; }
-
-    IAssetsClient Assets { get; }
-
-    IBackupsClient Backups { get; }
-
-    ISchemasClient Schemas { get; }
-
-    IExtendableRulesClient Rules { get; }
-
-    IContentsClient<TEntity, TData> Contents<TEntity, TData>(string schemaName) where TEntity : Content<TData> where TData : class, new();
-
-    IContentsClient<DynamicContent, DynamicData> Contents(string schemaName);
+    ISquidexClient Client { get; }
 }
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ExportHelper.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ExportHelper.cs
index b351ce49..d63520e7 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ExportHelper.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ExportHelper.cs
@@ -15,7 +15,7 @@ public static async Task ExportAsync(this ISession session, IExportSettings sett
     {
         var ctx = QueryContext.Default.Unpublished(settings.Unpublished);
 
-        var contents = session.Contents(settings.Schema);
+        var contents = session.Client.DynamicContents(settings.Schema);
 
         var total = 0L;
         var totalRead = 0;
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ImportHelper.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ImportHelper.cs
index c1f56bce..505c4af1 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ImportHelper.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/ImExport/ImportHelper.cs
@@ -21,7 +21,7 @@ public static class ImportHelper
 {
     public static async Task ImportAsync(this ISession session, IImportSettings setting, ILogger log, IEnumerable<DynamicData> datas)
     {
-        var contents = session.Contents(setting.Schema);
+        var contents = session.Client.DynamicContents(setting.Schema);
 
         var totalWritten = 0;
 
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/App/AppSynchronizer.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/App/AppSynchronizer.cs
index 10856e4d..878a1d16 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/App/AppSynchronizer.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/App/AppSynchronizer.cs
@@ -39,7 +39,7 @@ public async Task ExportAsync(ISyncService sync, SyncOptions options, ISession s
 
         await log.DoSafeAsync("Exporting clients", async () =>
         {
-            var clients = await session.Apps.GetClientsAsync(session.App);
+            var clients = await session.Client.Apps.GetClientsAsync();
 
             model.Clients = new Dictionary<string, AppClientModel>();
 
@@ -51,7 +51,7 @@ await log.DoSafeAsync("Exporting clients", async () =>
 
         await log.DoSafeAsync("Exporting languages", async () =>
         {
-            var languages = await session.Apps.GetLanguagesAsync(session.App);
+            var languages = await session.Client.Apps.GetLanguagesAsync();
 
             model.Languages = new Dictionary<string, UpdateLanguageDto>();
 
@@ -63,7 +63,7 @@ await log.DoSafeAsync("Exporting languages", async () =>
 
         await log.DoSafeAsync("Exporting Roles", async () =>
         {
-            var roles = await session.Apps.GetRolesAsync(session.App);
+            var roles = await session.Client.Apps.GetRolesAsync();
 
             model.Roles = new Dictionary<string, AppRoleModel>();
 
@@ -75,7 +75,7 @@ await log.DoSafeAsync("Exporting Roles", async () =>
 
         await log.DoSafeAsync("Exporting asset scripts", async () =>
         {
-            var assetScripts = await session.Apps.GetAssetScriptsAsync(session.App);
+            var assetScripts = await session.Client.Apps.GetAssetScriptsAsync();
 
             model.AssetScripts = assetScripts.ToModel();
         });
@@ -160,14 +160,14 @@ await log.DoSafeAsync($"Contributor '{email}' creating", async () =>
             {
                 var request = new AssignContributorDto { ContributorId = email, Role = value.Role, Invite = true };
 
-                await session.Apps.PostContributorAsync(session.App, request);
+                await session.Client.Apps.PostContributorAsync(request);
             });
         }
     }
 
     private async Task SynchronizeClientsAsync(AppModel model, SyncOptions options, ISession session)
     {
-        var current = await session.Apps.GetClientsAsync(session.App);
+        var current = await session.Client.Apps.GetClientsAsync();
 
         if (options.Delete)
         {
@@ -182,7 +182,7 @@ private async Task SynchronizeClientsAsync(AppModel model, SyncOptions options,
 
                 await log.DoSafeAsync($"Client '{client.Id}' deleting", async () =>
                 {
-                    await session.Apps.DeleteClientAsync(session.App, client.Id);
+                    await session.Client.Apps.DeleteClientAsync(client.Id);
                 });
             }
         }
@@ -200,7 +200,7 @@ await log.DoSafeAsync($"Client '{clientId}' creating", async () =>
             {
                 var request = new CreateClientDto { Id = clientId };
 
-                current = await session.Apps.PostClientAsync(session.App, request);
+                current = await session.Client.Apps.PostClientAsync(request);
             });
         }
 
@@ -222,14 +222,14 @@ await log.DoSafeAsync($"Client '{clientId}' updating", async () =>
             {
                 var request = client.ToUpdate();
 
-                await session.Apps.PutClientAsync(session.App, clientId, request);
+                await session.Client.Apps.PutClientAsync(clientId, request);
             });
         }
     }
 
     private async Task SynchronizeLanguagesAsync(AppModel model, SyncOptions options, ISession session)
     {
-        var current = await session.Apps.GetLanguagesAsync(session.App);
+        var current = await session.Client.Apps.GetLanguagesAsync();
 
         if (options.Delete)
         {
@@ -242,7 +242,7 @@ private async Task SynchronizeLanguagesAsync(AppModel model, SyncOptions options
 
                 await log.DoSafeAsync($"Language '{language.Iso2Code}' deleting", async () =>
                 {
-                    await session.Apps.DeleteLanguageAsync(session.App, language.Iso2Code);
+                    await session.Client.Apps.DeleteLanguageAsync(language.Iso2Code);
                 });
             }
         }
@@ -260,7 +260,7 @@ await log.DoSafeAsync($"Language '{isoCode}' creating", async () =>
             {
                 var request = new AddLanguageDto { Language = isoCode };
 
-                current = await session.Apps.PostLanguageAsync(session.App, request);
+                current = await session.Client.Apps.PostLanguageAsync(request);
             });
         }
 
@@ -275,14 +275,14 @@ await log.DoSafeAsync($"Language '{isoCode}' creating", async () =>
 
             await log.DoSafeAsync($"Language '{isoCode}' updating", async () =>
             {
-                await session.Apps.PutLanguageAsync(session.App, isoCode, language);
+                await session.Client.Apps.PutLanguageAsync(isoCode, language);
             });
         }
     }
 
     private async Task SynchronizeRolesAsync(AppModel model, SyncOptions options, ISession session)
     {
-        var current = await session.Apps.GetRolesAsync(session.App);
+        var current = await session.Client.Apps.GetRolesAsync();
 
         if (options.Delete)
         {
@@ -298,7 +298,7 @@ private async Task SynchronizeRolesAsync(AppModel model, SyncOptions options, IS
 
                 await log.DoSafeAsync($"Role '{role.Name}' deleting", async () =>
                 {
-                    await session.Apps.DeleteRoleAsync(session.App, role.Name);
+                    await session.Client.Apps.DeleteRoleAsync(role.Name);
                 });
             }
         }
@@ -316,7 +316,7 @@ await log.DoSafeAsync($"Role '{roleName}' creating", async () =>
             {
                 var request = new AddRoleDto { Name = roleName };
 
-                current = await session.Apps.PostRoleAsync(session.App, request);
+                current = await session.Client.Apps.PostRoleAsync(request);
             });
         }
 
@@ -333,7 +333,7 @@ await log.DoSafeAsync($"Role '{roleName}' updating", async () =>
             {
                 var request = role.ToUpdate();
 
-                await session.Apps.PutRoleAsync(session.App, roleName, request);
+                await session.Client.Apps.PutRoleAsync(roleName, request);
             });
         }
     }
@@ -349,7 +349,7 @@ await log.DoSafeAsync("Asset scripts updating", async () =>
         {
             var request = model.AssetScripts?.ToUpdate() ?? new UpdateAssetScriptsDto();
 
-            await session.Apps.PutAssetScriptsAsync(session.App, request);
+            await session.Client.Apps.PutAssetScriptsAsync(request);
         });
     }
 
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/AssetsSynchronizer.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/AssetsSynchronizer.cs
index d4800de5..3362e5ff 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/AssetsSynchronizer.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/AssetsSynchronizer.cs
@@ -61,7 +61,7 @@ await log.DoSafeAsync($"Exporting Assets ({assetBatch})", async () =>
                 });
             }
 
-            await session.Assets.GetAllAsync(session.App, async asset =>
+            await session.Client.Assets.GetAllAsync(async asset =>
             {
                 var model = asset.ToModel();
 
@@ -143,7 +143,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
 
                 var assetIndex = 0;
 
-                var results = await session.Assets.BulkUpdateAssetsAsync(session.App, request);
+                var results = await session.Client.Assets.BulkUpdateAssetsAsync(request);
 
                 foreach (var asset in model.Assets)
                 {
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/DownloadPipeline.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/DownloadPipeline.cs
index cfde2c16..1b60341f 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/DownloadPipeline.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/DownloadPipeline.cs
@@ -64,7 +64,7 @@ public DownloadPipeline(ISession session, ILogger log, IFileSystem fs)
 
                 if (assetHash == null || !string.Equals(asset.FileHash, assetHash, StringComparison.Ordinal))
                 {
-                    var response = await session.Assets.GetAssetContentBySlugAsync(session.App, asset.Id, string.Empty);
+                    var response = await session.Client.Assets.GetAssetContentBySlugAsync(asset.Id, string.Empty);
 
                     await using (response.Stream)
                     {
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/UploadPipeline.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/UploadPipeline.cs
index 9eda2fd4..579e77b3 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/UploadPipeline.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Assets/UploadPipeline.cs
@@ -24,7 +24,7 @@ internal sealed class UploadPipeline
 
     public UploadPipeline(ISession session, ILogger log, IFileSystem fs)
     {
-        var tree = new AssetFolderTree(session.Assets, session.App);
+        var tree = new AssetFolderTree(session.Client.Assets);
 
         var fileNameStep = new TransformBlock<AssetModel, (AssetModel, FilePath)>(async asset =>
         {
@@ -68,7 +68,7 @@ public UploadPipeline(ISession session, ILogger log, IFileSystem fs)
                 {
                     var file = new FileParameter(stream, asset.FileName, asset.MimeType);
 
-                    var result = await session.Assets.PostUpsertAssetAsync(session.App, asset.Id, null, true, file);
+                    var result = await session.Client.Assets.PostUpsertAssetAsync(asset.Id, null, true, file);
 
                     log.ProcessCompleted(process);
                 }
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Contents/ContentsSynchronizer.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Contents/ContentsSynchronizer.cs
index e7770635..ba1af65b 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Contents/ContentsSynchronizer.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Contents/ContentsSynchronizer.cs
@@ -37,14 +37,14 @@ public Task CleanupAsync(IFileSystem fs)
 
     public async Task ExportAsync(ISyncService sync, SyncOptions options, ISession session)
     {
-        var schemas = await session.Schemas.GetSchemasAsync(session.App);
+        var schemas = await session.Client.Schemas.GetSchemasAsync();
         var schemaMap = schemas.Items.ToDictionary(x => x.Id, x => x.Name);
 
         var context = QueryContext.Default.Unpublished().IgnoreFallback();
 
         foreach (var schema in schemas.Items)
         {
-            var client = session.Contents(schema.Name);
+            var client = session.Client.DynamicContents(schema.Name);
 
             var contents = new List<ContentModel>();
             var contentBatch = 0;
@@ -114,7 +114,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
             GetFiles(sync.FileSystem)
                 .Select(x => (x, sync.Read<ContentsModel>(x, log)));
 
-        var schemas = await session.Schemas.GetSchemasAsync(session.App);
+        var schemas = await session.Client.Schemas.GetSchemasAsync();
         var schemaMap = schemas.Items.ToDictionary(x => x.Name, x => x.Id);
 
         var mapper = new Extensions.Mapper(session.Url, session.App, options.Languages);
@@ -125,7 +125,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
             {
                 mapper.Map(model);
 
-                var client = session.Contents(model.Contents[0].Schema);
+                var client = session.Client.DynamicContents(model.Contents[0].Schema);
 
                 var request = new BulkUpdate
                 {
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Rules/RulesSynchronizer.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Rules/RulesSynchronizer.cs
index 5494ab72..cf424702 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Rules/RulesSynchronizer.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Rules/RulesSynchronizer.cs
@@ -38,7 +38,7 @@ public Task CleanupAsync(IFileSystem fs)
 
     public async Task ExportAsync(ISyncService sync, SyncOptions options, ISession session)
     {
-        var current = await session.Rules.GetRulesAsync();
+        var current = await session.Client.ExtendableRules.GetRulesAsync();
 
         await MapSchemaIdsToNamesAsync(session, current);
 
@@ -90,7 +90,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
             return;
         }
 
-        var current = await session.Rules.GetRulesAsync();
+        var current = await session.Client.ExtendableRules.GetRulesAsync();
 
         if (!current.Items.HasDistinctNames(x => x.Name))
         {
@@ -108,7 +108,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
                 {
                     await log.DoSafeAsync($"Rule '{name}' deleting", async () =>
                     {
-                        await session.Rules.DeleteRuleAsync(rule.Id);
+                        await session.Client.ExtendableRules.DeleteRuleAsync(rule.Id);
 
                         rulesByName.Remove(name);
                     });
@@ -134,7 +134,7 @@ await log.DoSafeAsync($"Rule '{newRule.Name}' creating", async () =>
 
                 var request = newRule.ToCreate();
 
-                var created = await session.Rules.CreateRuleAsync(request);
+                var created = await session.Client.ExtendableRules.CreateRuleAsync(request);
 
                 rulesByName[newRule.Name] = created;
             });
@@ -153,7 +153,7 @@ await log.DoVersionedAsync($"Rule '{newRule.Name}' updating", rule.Version, asyn
             {
                 var request = newRule.ToUpdate();
 
-                rule = await session.Rules.UpdateRuleAsync(rule.Id, request);
+                rule = await session.Client.ExtendableRules.UpdateRuleAsync(rule.Id, request);
 
                 return rule.Version;
             });
@@ -164,7 +164,7 @@ await log.DoVersionedAsync($"Rule '{newRule.Name}' updating", rule.Version, asyn
                 {
                     await log.DoVersionedAsync($"Rule '{newRule.Name}' enabling", rule.Version, async () =>
                     {
-                        var result = await session.Rules.EnableRuleAsync(rule.Id);
+                        var result = await session.Client.ExtendableRules.EnableRuleAsync(rule.Id);
 
                         return result.Version;
                     });
@@ -173,7 +173,7 @@ await log.DoVersionedAsync($"Rule '{newRule.Name}' enabling", rule.Version, asyn
                 {
                     await log.DoVersionedAsync($"Rule '{newRule.Name}' disabling", rule.Version, async () =>
                     {
-                        var result = await session.Rules.DisableRuleAsync(rule.Id);
+                        var result = await session.Client.ExtendableRules.DisableRuleAsync(rule.Id);
 
                         return result.Version;
                     });
@@ -184,7 +184,7 @@ await log.DoVersionedAsync($"Rule '{newRule.Name}' disabling", rule.Version, asy
 
     private async Task MapSchemaIdsToNamesAsync(ISession session, ExtendableRules current)
     {
-        var schemas = await session.Schemas.GetSchemasAsync(session.App);
+        var schemas = await session.Client.Schemas.GetSchemasAsync();
 
         var map = schemas.Items.ToDictionary(x => x.Id, x => x.Name);
 
@@ -200,7 +200,7 @@ private async Task MapSchemaIdsToNamesAsync(ISession session, ExtendableRules cu
 
     private async Task MapSchemaNamesToIdsAsync(ISession session, List<RuleModel> models)
     {
-        var schemas = await session.Schemas.GetSchemasAsync(session.App);
+        var schemas = await session.Client.Schemas.GetSchemasAsync();
 
         var map = schemas.Items.ToDictionary(x => x.Name, x => x.Id);
 
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Schemas/SchemasSynchronizer.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Schemas/SchemasSynchronizer.cs
index e83afe17..c0f1241b 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Schemas/SchemasSynchronizer.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Schemas/SchemasSynchronizer.cs
@@ -60,7 +60,7 @@ public Task DescribeAsync(ISyncService sync, MarkdownWriter writer)
 
     public async Task ExportAsync(ISyncService sync, SyncOptions options, ISession session)
     {
-        var current = await session.Schemas.GetSchemasAsync(session.App);
+        var current = await session.Client.Schemas.GetSchemasAsync();
 
         var schemaMap = current.Items.ToDictionary(x => x.Id, x => x.Name);
 
@@ -68,7 +68,7 @@ public async Task ExportAsync(ISyncService sync, SyncOptions options, ISession s
         {
             await log.DoSafeAsync($"Exporting '{schema.Name}'", async () =>
             {
-                var details = await session.Schemas.GetSchemaAsync(session.App, schema.Name);
+                var details = await session.Client.Schemas.GetSchemaAsync(schema.Name);
 
                 var model = new SchemaModel
                 {
@@ -99,7 +99,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
             return;
         }
 
-        var current = await session.Schemas.GetSchemasAsync(session.App);
+        var current = await session.Client.Schemas.GetSchemasAsync();
 
         var schemasByName = current.Items.ToDictionary(x => x.Name);
 
@@ -111,7 +111,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
                 {
                     await log.DoSafeAsync($"Schema {name} deleting", async () =>
                     {
-                        await session.Schemas.DeleteSchemaAsync(session.App, name);
+                        await session.Client.Schemas.DeleteSchemaAsync(name);
                     });
                 }
             }
@@ -126,7 +126,7 @@ await log.DoSafeAsync($"Schema {name} deleting", async () =>
 
             await log.DoSafeAsync($"Schema {model.Name} creating", async () =>
             {
-                var created = await session.Schemas.PostSchemaAsync(session.App, model.ToCreate());
+                var created = await session.Client.Schemas.PostSchemaAsync(model.ToCreate());
 
                 schemasByName[model.Name] = created;
             });
@@ -151,7 +151,7 @@ await log.DoSafeAsync($"Schema {model.Name} creating", async () =>
 
             await log.DoVersionedAsync($"Schema {model.Name} updating", version, async () =>
             {
-                var result = await session.Schemas.PutSchemaSyncAsync(session.App, model.Name, model.Schema);
+                var result = await session.Client.Schemas.PutSchemaSyncAsync(model.Name, model.Schema);
 
                 return result.Version;
             });
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/SyncService.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/SyncService.cs
index f39d345b..b940bee6 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/SyncService.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/SyncService.cs
@@ -42,7 +42,7 @@ protected override JsonDictionaryContract CreateDictionaryContract(Type objectTy
 
     public SyncService(IFileSystem fileSystem, ISession session)
     {
-        Folders = new AssetFolderTree(session.Assets, session.App);
+        Folders = new AssetFolderTree(session.Client.Assets);
 
         jsonSerializerSettings = new JsonSerializerSettings
         {
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Workflows/WorkflowsSynchronizer.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Workflows/WorkflowsSynchronizer.cs
index 7d296b57..eb329ee5 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Workflows/WorkflowsSynchronizer.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Commands/Implementation/Sync/Workflows/WorkflowsSynchronizer.cs
@@ -37,9 +37,9 @@ public Task CleanupAsync(IFileSystem fs)
 
     public async Task ExportAsync(ISyncService sync, SyncOptions options, ISession session)
     {
-        var current = await session.Apps.GetWorkflowsAsync(session.App);
+        var current = await session.Client.Apps.GetWorkflowsAsync();
 
-        var schemas = await session.Schemas.GetSchemasAsync(session.App);
+        var schemas = await session.Client.Schemas.GetSchemasAsync();
         var schemaMap = schemas.Items.ToDictionary(x => x.Id, x => x.Name);
 
         await current.Items.OrderBy(x => x.Name).Foreach(async (workflow, i) =>
@@ -87,7 +87,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
             return;
         }
 
-        var current = await session.Apps.GetWorkflowsAsync(session.App);
+        var current = await session.Client.Apps.GetWorkflowsAsync();
 
         if (!current.Items.HasDistinctNames(x => x.Name))
         {
@@ -105,7 +105,7 @@ public async Task ImportAsync(ISyncService sync, SyncOptions options, ISession s
                 {
                     await log.DoSafeAsync($"Workflow '{name}' deleting", async () =>
                     {
-                        await session.Apps.DeleteWorkflowAsync(session.App, workflow.Id);
+                        await session.Client.Apps.DeleteWorkflowAsync(workflow.Id);
 
                         workflowsByName.Remove(name);
                     });
@@ -132,13 +132,13 @@ await log.DoSafeAsync($"Workflow '{workflow.Name}' creating", async () =>
                     Name = workflow.Name
                 };
 
-                var created = await session.Apps.PostWorkflowAsync(session.App, request);
+                var created = await session.Client.Apps.PostWorkflowAsync(request);
 
                 workflowsByName[workflow.Name] = created.Items.Find(x => x.Name == workflow.Name);
             });
         }
 
-        var schemas = await session.Schemas.GetSchemasAsync(session.App);
+        var schemas = await session.Client.Schemas.GetSchemasAsync();
         var schemaMap = schemas.Items.ToDictionary(x => x.Name, x => x.Id);
 
         foreach (var workflow in models)
@@ -154,7 +154,7 @@ await log.DoSafeAsync($"Workflow '{workflow.Name}' creating", async () =>
 
             await log.DoSafeAsync($"Workflow '{workflow.Name}' updating", async () =>
             {
-                await session.Apps.PutWorkflowAsync(session.App, existing.Id, workflow);
+                await session.Client.Apps.PutWorkflowAsync(existing.Id, workflow);
             });
         }
     }
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/ConfigurationService.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/ConfigurationService.cs
index b3882528..3f3953c6 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/ConfigurationService.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/ConfigurationService.cs
@@ -9,7 +9,6 @@
 using Squidex.CLI.Commands.Implementation;
 using Squidex.CLI.Commands.Implementation.Utils;
 using Squidex.ClientLibrary;
-using Squidex.ClientLibrary.Configuration;
 
 namespace Squidex.CLI.Configuration;
 
@@ -168,14 +167,14 @@ public ISession StartSession(string appName, bool emulate = false)
         {
             var options = CreateOptions(app, emulate);
 
-            return new Session(app.Name, WorkingDirectory, new SquidexClientManager(options));
+            return new Session(WorkingDirectory, new SquidexClient(options));
         }
 
         if (!string.IsNullOrWhiteSpace(configuration.CurrentApp) && configuration.Apps.TryGetValue(configuration.CurrentApp, out app))
         {
             var options = CreateOptions(app, emulate);
 
-            return new Session(app.Name, WorkingDirectory, new SquidexClientManager(options));
+            return new Session(WorkingDirectory, new SquidexClient(options));
         }
 
         throw new CLIException("Cannot find valid configuration.");
@@ -185,21 +184,17 @@ private static SquidexOptions CreateOptions(ConfiguredApp app, bool emulate)
     {
         var options = new SquidexOptions
         {
+            IgnoreSelfSignedCertificates = app.IgnoreSelfSigned,
             AppName = app.Name,
             ClientId = app.ClientId,
             ClientSecret = app.ClientSecret,
             Url = app.ServiceUrl,
-            HttpClientTimeout = TimeSpan.FromHours(1)
+            Timeout = TimeSpan.FromHours(1)
         };
 
-        if (app.IgnoreSelfSigned)
-        {
-            options.Configurator = AcceptAllCertificatesConfigurator.Instance;
-        }
-
         if (emulate)
         {
-            options.ClientFactory = new GetOnlyHttpClientFactory();
+            options.ClientProvider = new GetOnlyHttpClientProvider(options);
         }
 
         return options;
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/GetOnlyHttpClient.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/GetOnlyHttpClient.cs
index 324a881a..f0b47d8a 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/GetOnlyHttpClient.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/GetOnlyHttpClient.cs
@@ -9,14 +9,10 @@
 
 namespace Squidex.CLI.Configuration;
 
-public sealed class GetOnlyHttpClient : HttpClient
+public sealed class GetOnlyHttpMessageHandler : DelegatingHandler
 {
-    public GetOnlyHttpClient(HttpMessageHandler messageHandler)
-        : base(messageHandler)
-    {
-    }
-
-    public override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken cancellationToken)
+    protected override HttpResponseMessage Send(HttpRequestMessage request,
+        CancellationToken cancellationToken)
     {
         if (request.Method != HttpMethod.Get)
         {
@@ -26,7 +22,8 @@ public override HttpResponseMessage Send(HttpRequestMessage request, Cancellatio
         return base.Send(request, cancellationToken);
     }
 
-    public override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
+        CancellationToken cancellationToken)
     {
         if (request.Method != HttpMethod.Get)
         {
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/GetOnlyHttpClientFactory.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/GetOnlyHttpClientFactory.cs
index 7826f7b4..990c8ce0 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/GetOnlyHttpClientFactory.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/GetOnlyHttpClientFactory.cs
@@ -5,19 +5,27 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using Google.Protobuf.WellKnownTypes;
+using Squidex.ClientLibrary;
 using Squidex.ClientLibrary.Configuration;
+using Squidex.ClientLibrary.Utils;
 
 namespace Squidex.CLI.Configuration;
 
-public sealed class GetOnlyHttpClientFactory : IHttpClientFactory
+public sealed class GetOnlyHttpClientProvider : StaticHttpClientProvider
 {
-    public HttpClient? CreateHttpClient(HttpMessageHandler messageHandler)
+    public GetOnlyHttpClientProvider(SquidexOptions options)
+        : base(options)
     {
-        return new GetOnlyHttpClient(messageHandler);
     }
 
-    public HttpMessageHandler? CreateHttpMessageHandler(HttpMessageHandler inner)
+    protected override HttpMessageHandler CreateMessageHandler(SquidexOptions options)
     {
-        return null;
+        var baseHandler = base.CreateMessageHandler(options);
+
+        return new GetOnlyHttpMessageHandler
+        {
+            InnerHandler = baseHandler
+        };
     }
 }
diff --git a/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/Session.cs b/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/Session.cs
index bc1ff860..7962091c 100644
--- a/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/Session.cs
+++ b/cli/Squidex.CLI/Squidex.CLI.Core/Configuration/Session.cs
@@ -7,87 +7,27 @@
 
 using Squidex.CLI.Commands.Implementation;
 using Squidex.ClientLibrary;
-using Squidex.ClientLibrary.Management;
 
 namespace Squidex.CLI.Configuration;
 
 public sealed class Session : ISession
 {
-    private readonly SquidexClientManager clientManager;
-    private readonly Dictionary<string, IContentsClient<DynamicContent, DynamicData>> contents = new Dictionary<string, IContentsClient<DynamicContent, DynamicData>>();
-    private IAppsClient apps;
-    private IAssetsClient assets;
-    private IBackupsClient backups;
-    private ISchemasClient schemas;
-    private IExtendableRulesClient rules;
-
-    public string App { get; }
-
     public DirectoryInfo WorkingDirectory { get; }
 
-    public IAppsClient Apps
-    {
-        get => apps ??= clientManager.CreateAppsClient();
-    }
-
-    public IAssetsClient Assets
-    {
-        get => assets ??= clientManager.CreateAssetsClient();
-    }
+    public ISquidexClient Client { get; }
 
-    public IBackupsClient Backups
-    {
-        get => backups ??= clientManager.CreateBackupsClient();
-    }
-
-    public IExtendableRulesClient Rules
-    {
-        get => rules ??= clientManager.CreateExtendableRulesClient();
-    }
-
-    public ISchemasClient Schemas
-    {
-        get => schemas ??= clientManager.CreateSchemasClient();
-    }
+    public string App => Client.Options.AppName;
 
-    public string ClientId
-    {
-        get => clientManager.Options.ClientId;
-    }
+    public string ClientId => Client.Options.ClientId;
 
-    public string ClientSecret
-    {
-        get => clientManager.Options.ClientSecret;
-    }
+    public string ClientSecret => Client.Options.ClientSecret;
 
-    public string Url
-    {
-        get => clientManager.Options.Url;
-    }
+    public string Url => Client.Options.Url;
 
-    public Session(string app, DirectoryInfo workingDirectory, SquidexClientManager clientManager)
+    public Session(DirectoryInfo workingDirectory, ISquidexClient client)
     {
-        App = app;
-
         WorkingDirectory = workingDirectory;
 
-        this.clientManager = clientManager;
-    }
-
-    public IContentsClient<TEntity, TData> Contents<TEntity, TData>(string schemaName) where TEntity : Content<TData> where TData : class, new()
-    {
-        return clientManager.CreateContentsClient<TEntity, TData>(schemaName);
-    }
-
-    public IContentsClient<DynamicContent, DynamicData> Contents(string schemaName)
-    {
-        if (!contents.TryGetValue(schemaName, out var client))
-        {
-            client = clientManager.CreateDynamicContentsClient(schemaName);
-
-            contents[schemaName] = client;
-        }
-
-        return client;
+        Client = client;
     }
 }
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Apps.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Apps.cs
index b356b89d..63c5c13f 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Apps.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Apps.cs
@@ -35,7 +35,7 @@ public async Task List(ListArguments arguments)
         {
             var session = configuration.StartSession(arguments.App);
 
-            var apps = await session.Apps.GetAppsAsync();
+            var apps = await session.Client.Apps.GetAppsAsync();
 
             if (arguments.Table)
             {
@@ -71,7 +71,7 @@ public async Task Create(CreateArguments arguments)
                 Name = name
             };
 
-            await session.Apps.PostAppAsync(request);
+            await session.Client.Apps.PostAppAsync(request);
 
             log.WriteLine("> App created.");
         }
@@ -93,7 +93,7 @@ public async Task Delete(DeleteArguments arguments)
                 throw new CLIException("Confirmed app name does not match.");
             }
 
-            await session.Apps.DeleteAppAsync(name);
+            await session.Client.Apps.DeleteAppAsync();
 
             log.WriteLine("> App deleted.");
         }
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Assets.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Assets.cs
index e8626c40..14f14b67 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Assets.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Assets.cs
@@ -38,11 +38,9 @@ public async Task Import(ImportArguments arguments)
         {
             var session = configuration.StartSession(arguments.App);
 
-            var assets = session.Assets;
-
             using (var fs = await FileSystems.CreateAsync(arguments.Path))
             {
-                var folders = new AssetFolderTree(session.Assets, session.App);
+                var folders = new AssetFolderTree(session.Client.Assets);
 
                 var assetQuery = new AssetQuery();
 
@@ -58,7 +56,7 @@ public async Task Import(ImportArguments arguments)
                     assetQuery.ParentId = await folders.GetIdAsync(targetFolder);
                     assetQuery.Filter = $"fileName eq '{file.Name}'";
 
-                    var existings = await assets.GetAssetsAsync(session.App, assetQuery);
+                    var existings = await session.Client.Assets.GetAssetsAsync(assetQuery);
                     var existing = existings.Items.FirstOrDefault();
 
                     var fileHash = file.GetFileHash();
@@ -79,13 +77,13 @@ public async Task Import(ImportArguments arguments)
                         }
                         else if (existing != null)
                         {
-                            await assets.PutAssetContentAsync(session.App, existing.Id, fileParameter);
+                            await session.Client.Assets.PutAssetContentAsync(existing.Id, fileParameter);
 
                             log.StepSuccess("Existing Asset");
                         }
                         else
                         {
-                            var result = await assets.PostAssetAsync(session.App, assetQuery.ParentId, null, arguments.Duplicate, fileParameter);
+                            var result = await session.Client.Assets.PostAssetAsync(assetQuery.ParentId, null, arguments.Duplicate, fileParameter);
 
                             if (result._meta?.IsDuplicate == "true")
                             {
@@ -116,11 +114,9 @@ public async Task Export(ImportArguments arguments)
         {
             var session = configuration.StartSession(arguments.App);
 
-            var assets = session.Assets;
-
             using (var fs = await FileSystems.CreateAsync(arguments.Path))
             {
-                var folderTree = new AssetFolderTree(session.Assets, session.App);
+                var folderTree = new AssetFolderTree(session.Client.Assets);
                 var folderNames = new HashSet<string>();
 
                 var parentId = await folderTree.GetIdAsync(arguments.TargetFolder);
@@ -148,7 +144,7 @@ public async Task Export(ImportArguments arguments)
 
                 try
                 {
-                    await assets.GetAllByQueryAsync(session.App, async asset =>
+                    await session.Client.Assets.GetAllByQueryAsync(async asset =>
                     {
                         await downloadPipeline.DownloadAsync(asset);
                     },
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs
index cdbd3408..bb1dcf31 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs
@@ -36,7 +36,7 @@ public async Task Create(CreateArguments arguments)
 
             var backupStarted = DateTime.UtcNow.AddMinutes(-5);
 
-            await session.Backups.PostBackupAsync(session.App);
+            await session.Client.Backups.PostBackupAsync();
 
             log.WriteLine("Backup started, waiting for completion...");
 
@@ -46,7 +46,7 @@ public async Task Create(CreateArguments arguments)
             {
                 while (!tcs.Token.IsCancellationRequested)
                 {
-                    var backups = await session.Backups.GetBackupsAsync(session.App, tcs.Token);
+                    var backups = await session.Client.Backups.GetBackupsAsync(tcs.Token);
                     var backup = backups.Items.Find(x => x.Started >= backupStarted);
 
                     if (backup?.Stopped != null)
@@ -69,7 +69,7 @@ public async Task Create(CreateArguments arguments)
 
                 await using (var fs = new FileStream(arguments.File, FileMode.CreateNew))
                 {
-                    using (var download = await session.Backups.GetBackupContentAsync(session.App, foundBackup.Id))
+                    using (var download = await session.Client.Backups.GetBackupContentAsync(foundBackup.Id))
                     {
                         await download.Stream.CopyToAsync(fs);
                     }
@@ -79,7 +79,7 @@ public async Task Create(CreateArguments arguments)
                 {
                     log.WriteLine("Removing backup from app...");
 
-                    await session.Backups.DeleteBackupAsync(session.App, foundBackup.Id);
+                    await session.Client.Backups.DeleteBackupAsync(foundBackup.Id);
                 }
 
                 log.WriteLine("> Backup completed and downloaded");
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Content.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Content.cs
index d7b48d06..0190f263 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Content.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Content.cs
@@ -42,8 +42,8 @@ public async Task TestData(TestDataArguments arguments)
         {
             var session = configuration.StartSession(arguments.App);
 
-            var taskForSchema = session.Schemas.GetSchemaAsync(session.App, arguments.Schema);
-            var taskForLanguages = session.Apps.GetLanguagesAsync(session.App);
+            var taskForSchema = session.Client.Schemas.GetSchemaAsync(arguments.Schema);
+            var taskForLanguages = session.Client.Apps.GetLanguagesAsync();
 
             await Task.WhenAll(
                 taskForSchema,
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Schemas.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Schemas.cs
index d2e12041..c622315e 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Schemas.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Schemas.cs
@@ -39,7 +39,7 @@ public async Task List(ListArguments arguments)
         {
             var session = configuration.StartSession(arguments.App);
 
-            var schemas = await session.Schemas.GetSchemasAsync(session.App);
+            var schemas = await session.Client.Schemas.GetSchemasAsync();
 
             if (arguments.Table)
             {
@@ -63,11 +63,11 @@ public async Task Get(GetArguments arguments)
         {
             var session = configuration.StartSession(arguments.App);
 
-            var schema = await session.Schemas.GetSchemaAsync(session.App, arguments.Name);
+            var schema = await session.Client.Schemas.GetSchemaAsync(arguments.Name);
 
             if (arguments.WithReferencedNames)
             {
-                var allSchemas = await session.Schemas.GetSchemasAsync(session.App);
+                var allSchemas = await session.Client.Schemas.GetSchemasAsync();
 
                 var result = new SchemaWithRefs<SchemaDto>(schema).EnrichSchemaNames(allSchemas.Items);
 
@@ -118,7 +118,7 @@ public async Task Sync(SyncArguments arguments)
             SchemaDto? targetSchema;
             try
             {
-                targetSchema = await session.Schemas.GetSchemaAsync(session.App, schemaName);
+                targetSchema = await session.Client.Schemas.GetSchemaAsync(schemaName);
             }
             catch
             {
@@ -131,14 +131,14 @@ public async Task Sync(SyncArguments arguments)
 
                 if (!arguments.NoRefFix && request.ReferencedSchemas.Any())
                 {
-                    var allSchemas = await session.Schemas.GetSchemasAsync(session.App);
+                    var allSchemas = await session.Client.Schemas.GetSchemasAsync();
 
                     request.AdjustReferences(allSchemas.Items);
                 }
 
                 request.Schema.Name = schemaName;
 
-                await session.Schemas.PostSchemaAsync(session.App, request.Schema);
+                await session.Client.Schemas.PostSchemaAsync(request.Schema);
 
                 log.WriteLine("> Created schema because it does not exists in the target system.");
             }
@@ -148,7 +148,7 @@ public async Task Sync(SyncArguments arguments)
 
                 if (!arguments.NoRefFix && request.ReferencedSchemas.Any())
                 {
-                    var allSchemas = await session.Schemas.GetSchemasAsync(session.App);
+                    var allSchemas = await session.Client.Schemas.GetSchemasAsync();
 
                     request.AdjustReferences(allSchemas.Items);
                 }
@@ -156,7 +156,7 @@ public async Task Sync(SyncArguments arguments)
                 request.Schema.NoFieldDeletion = arguments.NoFieldDeletion;
                 request.Schema.NoFieldRecreation = arguments.NoFieldRecreation;
 
-                await session.Schemas.PutSchemaSyncAsync(session.App, schemaName, request.Schema);
+                await session.Client.Schemas.PutSchemaSyncAsync(schemaName, request.Schema);
 
                 log.WriteLine("> Synchronized schema");
             }
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/OpenLibrary/AuthorImporter.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/OpenLibrary/AuthorImporter.cs
index 0206e5de..e74a46c3 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/OpenLibrary/AuthorImporter.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/Implementation/OpenLibrary/AuthorImporter.cs
@@ -29,7 +29,7 @@ private sealed record AuthorRecord(string Id, AuthorData Author);
 
     public AuthorImporter(ISession session, ILogger log)
     {
-        client = session.Contents<AuthorContent, AuthorData>("author");
+        client = session.Client.Contents<AuthorContent, AuthorData>("author");
 
         this.log = log;
     }
diff --git a/csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.ReadObjectResponse.liquid b/csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.ReadObjectResponse.liquid
new file mode 100644
index 00000000..de0451c5
--- /dev/null
+++ b/csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.ReadObjectResponse.liquid
@@ -0,0 +1,58 @@
+protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
+{
+    if (response == null || response.Content == null)
+    {
+{%- if GenerateNullableReferenceTypes -%}
+        return new ObjectResponseResult<T>(default(T)!, string.Empty);
+{%- else -%}
+        return new ObjectResponseResult<T>(default(T), string.Empty);
+{%- endif -%}
+    }
+
+    if (_options.ReadResponseAsString)
+    {
+        var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        try
+        {
+            var typedBody = {% if UseSystemTextJson %}System.Text.Json.JsonSerializer.Deserialize{% else %}Newtonsoft.Json.JsonConvert.DeserializeObject{% endif %}<T>(responseText, {% if UseRequestAndResponseSerializationSettings %}Response{% endif %}JsonSerializerSettings);
+{%- if GenerateNullableReferenceTypes -%}
+            return new ObjectResponseResult<T>(typedBody!, responseText);
+{%- else -%}
+            return new ObjectResponseResult<T>(typedBody, responseText);
+{%- endif -%}
+        }
+        catch ({% if UseSystemTextJson %}System.Text.Json.JsonException{% else %}Newtonsoft.Json.JsonException{% endif %} exception)
+        {
+            var message = "Could not deserialize the response body string as " + typeof(T).FullName + ".";
+            throw new {{ ExceptionClass }}(message, (int)response.StatusCode, responseText, headers, exception);
+        }
+    }
+    else
+    {
+        try
+        {
+            using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+{%- if UseSystemTextJson -%}
+            {
+                var typedBody = await System.Text.Json.JsonSerializer.DeserializeAsync<T>(responseStream, {% if UseRequestAndResponseSerializationSettings %}Response{% endif %}JsonSerializerSettings, cancellationToken).ConfigureAwait(false);
+{%- else -%}
+            using (var streamReader = new System.IO.StreamReader(responseStream))
+            using (var jsonTextReader = new Newtonsoft.Json.JsonTextReader(streamReader))
+            {
+                var serializer = Newtonsoft.Json.JsonSerializer.Create({% if UseRequestAndResponseSerializationSettings %}Response{% endif %}JsonSerializerSettings);
+                var typedBody = serializer.Deserialize<T>(jsonTextReader);
+{%- endif -%}
+{%- if GenerateNullableReferenceTypes -%}
+                return new ObjectResponseResult<T>(typedBody!, string.Empty);
+{%- else -%}
+                return new ObjectResponseResult<T>(typedBody, string.Empty);
+{%- endif -%}
+            }
+        }
+        catch ({% if UseSystemTextJson %}System.Text.Json.JsonException{% else %}Newtonsoft.Json.JsonException{% endif %} exception)
+        {
+            var message = "Could not deserialize the response body stream as " + typeof(T).FullName + ".";
+            throw new {{ ExceptionClass }}(message, (int)response.StatusCode, string.Empty, headers, exception);
+        }
+    }
+}
\ No newline at end of file
diff --git a/csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.liquid b/csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.liquid
index 9af69c6f..cb64bdd6 100644
--- a/csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.liquid
+++ b/csharp/Squidex.ClientLibrary/CodeGeneration/Client.Class.liquid
@@ -5,7 +5,7 @@
 {% if UseBaseUrl and GenerateBaseUrlProperty -%}
     private string _baseUrl = "{{ BaseUrl }}";
 {% endif -%}
-    private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+    private Squidex.ClientLibrary.SquidexOptions _options;
 {% if UseRequestAndResponseSerializationSettings -%}
     private System.Lazy<{{ JsonSerializerSettingsType }}> _requestSettings;
     private System.Lazy<{{ JsonSerializerSettingsType }}> _responseSettings;
@@ -13,9 +13,9 @@
     private System.Lazy<{{ JsonSerializerSettingsType }}> _settings;
 {% endif -%}
 
-    public {{ Class }}(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+    public {{ Class }}(Squidex.ClientLibrary.SquidexOptions options)
     {
-        _httpClientProvider = httpClientProvider;
+        _options = options;
 {% if UseRequestAndResponseSerializationSettings -%}
         _requestSettings = new System.Lazy<{{ JsonSerializerSettingsType }}>(() => CreateSerializerSettings(true));
         _responseSettings = new System.Lazy<{{ JsonSerializerSettingsType }}>(() => CreateSerializerSettings(false));
@@ -119,6 +119,7 @@
 {%     endif -%}
         var urlBuilder_ = new System.Text.StringBuilder();
         urlBuilder_.Append({% if UseBaseUrl %}BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/{% else %}"{% endif %}{{ operation.Path }}{% if operation.HasQueryParameters %}?{% endif %}");
+        urlBuilder_.Replace("{app}", _options.AppName);
 {%     for parameter in operation.PathParameters -%}
 {%         if parameter.IsOptional -%}
         if ({{ parameter.VariableName }} != null)
@@ -143,7 +144,7 @@
         urlBuilder_.Length--;
 {%     endif -%}
 
-        var client_ = _httpClientProvider.Get();
+        var client_ = _options.ClientProvider.Get();
         try
         {
 {%     if UseHttpRequestMessageCreationMethod -%}
@@ -152,12 +153,6 @@
             using (var request_ = new System.Net.Http.HttpRequestMessage())
 {%     endif -%}
             {
-{% for parameter in operation.Parameters %}
-{% if parameter.VariableName == "app" %}
-                request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-{% endif -%}
-{% endfor -%}
-
 {%     for parameter in operation.HeaderParameters %}
 {%         if parameter.IsRequired -%}
                 if ({{ parameter.VariableName }} == null)
@@ -365,7 +360,6 @@
         }
         finally
         {
-            _httpClientProvider.Return(client_);
         }
     }
 
diff --git a/csharp/Squidex.ClientLibrary/CodeGeneration/CodeGeneration.csproj b/csharp/Squidex.ClientLibrary/CodeGeneration/CodeGeneration.csproj
index 1393ab7d..bfacfa04 100644
--- a/csharp/Squidex.ClientLibrary/CodeGeneration/CodeGeneration.csproj
+++ b/csharp/Squidex.ClientLibrary/CodeGeneration/CodeGeneration.csproj
@@ -22,6 +22,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Client.Class.ReadObjectResponse.liquid">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Client.Class.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/csharp/Squidex.ClientLibrary/CodeGeneration/Program.cs b/csharp/Squidex.ClientLibrary/CodeGeneration/Program.cs
index 49c3dcf2..5a5a70ff 100644
--- a/csharp/Squidex.ClientLibrary/CodeGeneration/Program.cs
+++ b/csharp/Squidex.ClientLibrary/CodeGeneration/Program.cs
@@ -18,9 +18,22 @@ namespace CodeGeneration;
 
 public static class Program
 {
-    public static void Main()
+    public static async Task Main()
     {
-        var document = OpenApiDocument.FromUrlAsync("https://localhost:5001/api/swagger/v1/swagger.json").Result;
+        var document = await OpenApiDocument.FromUrlAsync("https://localhost:5001/api/swagger/v1/swagger.json");
+
+        foreach (var operation in document.Operations)
+        {
+            var parameters = operation.Operation.Parameters;
+
+            foreach (var parameter in parameters.ToList())
+            {
+                if (parameter.Kind == OpenApiParameterKind.Path && parameter.Name == "app")
+                {
+                    parameters.Remove(parameter);
+                }
+            }
+        }
 
         var generatorSettings = new CSharpClientGeneratorSettings();
         generatorSettings.ExceptionClass = "SquidexManagementException";
diff --git a/csharp/Squidex.ClientLibrary/Directory.Build.props b/csharp/Squidex.ClientLibrary/Directory.Build.props
index 803965c8..5fb9305b 100644
--- a/csharp/Squidex.ClientLibrary/Directory.Build.props
+++ b/csharp/Squidex.ClientLibrary/Directory.Build.props
@@ -15,7 +15,7 @@
     <PackageTags>Squidex HeadlessCMS</PackageTags>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>14.2.0</Version>
+    <Version>15.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
diff --git a/csharp/Squidex.ClientLibrary/README.md b/csharp/Squidex.ClientLibrary/README.md
index 8a795357..973d3239 100644
--- a/csharp/Squidex.ClientLibrary/README.md
+++ b/csharp/Squidex.ClientLibrary/README.md
@@ -6,70 +6,4 @@ Also available on [nuget.org](https://www.nuget.org/packages/Squidex.ClientLibra
 
 ## How to use it?
 
-Our recommendation is to have a look to the other samples to see how it works, but here is a short introduction.
-
-The client library uses the following namespace: `Squidex.ClientLibrary`
-
-### 1. Create your model.
-
-For each schema you have to create two classes.
-
-1. The data object:
-
-````
-public sealed class BlogPostData
-{
-    // Squidex delivers hash maps for each field, but the 
-    // InvariantConverter helps to simplify the model.
-    [JsonConverter(typeof(InvariantConverter))]
-    public string Title { get; set; }
-
-    [JsonConverter(typeof(InvariantConverter))]
-    public string Slug { get; set; }
-
-    // For localizable fields you can use dictionaries.
-    public Dictionary<string, string> Text { get; set; }
-}
-````
-
-2. The entity object
-
-````
-public sealed class BlogPost : Content<BlogPostData>
-{
-}
-````
-
-
-### 2. Initialize the client manager
-
-````
-var clientManager =
-    new SquidexClientManager(
-        new SquidexOptions
-        {
-            AppName = "...",
-            ClientId = "...",
-            ClientSecret = "...",
-            Url = "https://cloud.squidex.io"
-        });
-````
-
-### 3. Create a client for your schema
-
-````
-var client = clientManager.CreateContentsClient<BlogPost, BlogPostData>("posts");
-````
-
-### 4. Use the client
-
-````
-// Read posts pages
-var posts = await client.GetAsync(page * pageSize, pageSize);
-
-// Read post by id.
-var post = client.GetAsync(id);
-
-// Read posts by slug.
-var posts = await client.GetAsync(filter: $"data/slug/iv eq '{slug}'");
-````
\ No newline at end of file
+Go to the documentation for installation and usage instructions: https://docs.squidex.io/02-documentation/software-development-kits/.net-standard
\ No newline at end of file
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/HttpClientProvider.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/HttpClientProvider.cs
index a1f0a299..ac053f56 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/HttpClientProvider.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/HttpClientProvider.cs
@@ -9,36 +9,13 @@
 
 namespace Squidex.ClientLibrary.ServiceExtensions;
 
-/// <summary>
-/// Default http client provider, that works as wrapper over <see cref="System.Net.Http.IHttpClientFactory"/>.
-/// </summary>
-public sealed class HttpClientProvider : IHttpClientProvider
+internal sealed class HttpClientProvider : IHttpClientProvider
 {
     private readonly Func<HttpClient> factory;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HttpClientProvider"/> class with the wrapped  <see cref="System.Net.Http.IHttpClientFactory"/> see.
-    /// </summary>
-    /// <param name="httpClientFactory">The wrapped  <see cref="System.Net.Http.IHttpClientFactory"/>. Cannot be null.</param>
-    /// <param name="httpClientName">The logical name of the client to create. Cannot be null.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="httpClientFactory"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="httpClientName"/> is null.</exception>
-    public HttpClientProvider(System.Net.Http.IHttpClientFactory httpClientFactory, string httpClientName)
+    public HttpClientProvider(Func<HttpClient> factory)
     {
-        if (httpClientFactory == null)
-        {
-            throw new ArgumentNullException(nameof(httpClientFactory));
-        }
-
-        if (httpClientName == null)
-        {
-            throw new ArgumentNullException(nameof(httpClientName));
-        }
-
-        factory = () =>
-        {
-            return httpClientFactory.CreateClient(httpClientName);
-        };
+        this.factory = factory;
     }
 
     /// <inheritdoc />
@@ -46,9 +23,4 @@ public HttpClient Get()
     {
         return factory();
     }
-
-    /// <inheritdoc />
-    public void Return(HttpClient httpClient)
-    {
-    }
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/ISquidexClientFactory.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/ISquidexClientFactory.cs
new file mode 100644
index 00000000..e94068a2
--- /dev/null
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/ISquidexClientFactory.cs
@@ -0,0 +1,31 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+namespace Squidex.ClientLibrary.ServiceExtensions;
+
+/// <summary>
+/// Provides a client.
+/// </summary>
+public interface ISquidexClientProvider
+{
+    /// <summary>
+    /// Gets the default client.
+    /// </summary>
+    /// <returns>
+    /// The default client.
+    /// </returns>
+    ISquidexClient Get();
+
+    /// <summary>
+    /// Gets the client with the given name.
+    /// </summary>
+    /// <param name="name">The client name.</param>
+    /// <returns>
+    /// The client with the given name.
+    /// </returns>
+    ISquidexClient Get(string name);
+}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexClientLibraryServiceExtensions.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexClientLibraryServiceExtensions.cs
index a9383a05..9d688b26 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexClientLibraryServiceExtensions.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexClientLibraryServiceExtensions.cs
@@ -9,7 +9,6 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Http;
 using Microsoft.Extensions.Options;
-using Squidex.ClientLibrary;
 using Squidex.ClientLibrary.ServiceExtensions;
 using Squidex.ClientLibrary.Utils;
 
@@ -21,58 +20,48 @@ namespace Microsoft.Extensions.DependencyInjection;
 public static class SquidexClientLibraryServiceExtensions
 {
     /// <summary>
-    /// The name of the HTTP client.
+    /// Adds the Squidex client manager to the service collection.
     /// </summary>
-    public const string ClientName = "SquidexClient";
+    /// <param name="services">The service collection.</param>
+    /// <param name="configure">A callback to configure Squidex.</param>
+    /// <returns>The service collection that was passed in.</returns>
+    public static IServiceCollection AddSquidexClient(this IServiceCollection services, Action<SquidexServiceOptions>? configure = null)
+    {
+        return services.AddSquidexClient(Options.Options.DefaultName, configure);
+    }
 
     /// <summary>
     /// Adds the Squidex client manager to the service collection.
     /// </summary>
     /// <param name="services">The service collection.</param>
+    /// <param name="name">The name of the client.</param>
     /// <param name="configure">A callback to configure Squidex.</param>
     /// <returns>The service collection that was passed in.</returns>
-    public static IServiceCollection AddSquidexClient(this IServiceCollection services, Action<SquidexServiceOptions>? configure)
+    public static IServiceCollection AddSquidexClient(this IServiceCollection services, string name, Action<SquidexServiceOptions>? configure = null)
     {
         if (configure != null)
         {
-            services.Configure(configure);
+            services.Configure(name, configure);
         }
 
-        services.AddOptions<SquidexServiceOptions>()
-            .PostConfigure<IServiceProvider>((options, c) =>
+        services.AddOptions<SquidexServiceOptions>(name)
+            .PostConfigure<IHttpClientFactory>((options, c) =>
             {
-                options.ClientProvider = new HttpClientProvider(c.GetRequiredService<IHttpClientFactory>(), ClientName);
+                var clientName = ClientName(name);
+
+                options.ClientProvider = new HttpClientProvider(() => c.CreateClient(clientName));
             });
 
         services.TryAddSingleton<IValidateOptions<SquidexServiceOptions>,
-              OptionsValidator>();
-
-        AddSquidexHttpClient(services, null);
-
-        services.TryAddSingleton<ISquidexClientManager>(
-            c => new SquidexClientManager(c.GetRequiredService<IOptions<SquidexServiceOptions>>().Value));
-
-        services.AddSquidexClient(m => m.CreateAppsClient());
-        services.AddSquidexClient(m => m.CreateAssetsClient());
-        services.AddSquidexClient(m => m.CreateBackupsClient());
-        services.AddSquidexClient(m => m.CreateCommentsClient());
-        services.AddSquidexClient(m => m.CreateDiagnosticsClient());
-        services.AddSquidexClient(m => m.CreateEventConsumersClient());
-        services.AddSquidexClient(m => m.CreateExtendableRulesClient());
-        services.AddSquidexClient(m => m.CreateCommentsClient());
-        services.AddSquidexClient(m => m.CreateHistoryClient());
-        services.AddSquidexClient(m => m.CreateLanguagesClient());
-        services.AddSquidexClient(m => m.CreatePingClient());
-        services.AddSquidexClient(m => m.CreatePlansClient());
-        services.AddSquidexClient(m => m.CreateRulesClient());
-        services.AddSquidexClient(m => m.CreateSchemasClient());
-        services.AddSquidexClient(m => m.CreateSearchClient());
-        services.AddSquidexClient(m => m.CreateStatisticsClient());
-        services.AddSquidexClient(m => m.CreateTeamsClient());
-        services.AddSquidexClient(m => m.CreateTemplatesClient());
-        services.AddSquidexClient(m => m.CreateTranslationsClient());
-        services.AddSquidexClient(m => m.CreateUserManagementClient());
-        services.AddSquidexClient(m => m.CreateUsersClient());
+            SquidexOptionsValidator>();
+
+        services.TryAddSingleton<ISquidexClientProvider,
+            SquidexClientProvider>();
+
+        services.TryAddSingleton(
+            c => c.GetRequiredService<ISquidexClientProvider>().Get());
+
+        services.AddSquidexHttpClient(name);
 
         return services;
     }
@@ -80,32 +69,30 @@ public static IServiceCollection AddSquidexClient(this IServiceCollection servic
     /// <summary>
     /// Adds the Squidex client to the service collection.
     /// </summary>
-    /// <param name="services">The service collection.</param>
-    /// <param name="provider">A callback to provider the client from the manager.</param>
-    /// <returns>The service collection that was passed in.</returns>
-    /// <typeparam name="TClient">The type of the client to register.</typeparam>
-    public static IServiceCollection AddSquidexClient<TClient>(this IServiceCollection services, Func<ISquidexClientManager, TClient> provider) where TClient : class
+    /// <param name="services">The service collection to configure.</param>
+    /// <param name="configure">The callback to configure the HTTP client.</param>
+    /// <returns>The http client builder to make more customizatons.</returns>
+    public static IHttpClientBuilder AddSquidexHttpClient(this IServiceCollection services, Action<IServiceProvider, HttpClient>? configure = null)
     {
-        services.TryAddSingleton(c => provider(c.GetRequiredService<ISquidexClientManager>()));
-
-        return services;
+        return services.AddSquidexHttpClient(Options.Options.DefaultName, configure);
     }
 
     /// <summary>
     /// Adds the Squidex client to the service collection.
     /// </summary>
     /// <param name="services">The service collection to configure.</param>
+    /// <param name="name">The name of the client.</param>
     /// <param name="configure">The callback to configure the HTTP client.</param>
     /// <returns>The http client builder to make more customizatons.</returns>
-    public static IHttpClientBuilder AddSquidexHttpClient(this IServiceCollection services, Action<IServiceProvider, HttpClient>? configure = null)
+    public static IHttpClientBuilder AddSquidexHttpClient(this IServiceCollection services, string name, Action<IServiceProvider, HttpClient>? configure = null)
     {
-        return services.AddHttpClient(ClientName, (c, httpClient) =>
+        return services.AddHttpClient(ClientName(name), (c, httpClient) =>
         {
-            var options = c.GetRequiredService<IOptions<SquidexServiceOptions>>().Value;
+            var options = c.GetRequiredService<IOptionsMonitor<SquidexServiceOptions>>().Get(name);
 
-            if (options.ConfigureHttpClientWithTimeout)
+            if (options.ConfigureHttpClientWithTimeout && options.Timeout != null)
             {
-                httpClient.Timeout = options.HttpClientTimeout;
+                httpClient.Timeout = options.Timeout.Value;
             }
 
             if (options.ConfigureHttpClientWithUrl)
@@ -133,7 +120,7 @@ public static void AddSquidexAuthenticatorAsAdditionalHandler(this HttpMessageHa
     {
         var options = builder.Services.GetRequiredService<IOptions<SquidexServiceOptions>>().Value;
 
-        builder.AdditionalHandlers.Add(new AuthenticatingHttpMessageHandler(options.Authenticator));
+        builder.AdditionalHandlers.Add(new AuthenticatingHttpMessageHandler(options));
     }
 
     /// <summary>
@@ -144,6 +131,11 @@ public static void SetSquidexAuthenticatorAsPrimaryHandler(this HttpMessageHandl
     {
         var options = builder.Services.GetRequiredService<IOptions<SquidexServiceOptions>>().Value;
 
-        builder.PrimaryHandler = new AuthenticatingHttpMessageHandler(options.Authenticator);
+        builder.PrimaryHandler = new AuthenticatingHttpMessageHandler(options);
+    }
+
+    internal static string ClientName(string name)
+    {
+        return $"SquidexHttpClient_{name}";
     }
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexClientProvider.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexClientProvider.cs
new file mode 100644
index 00000000..1c94fd49
--- /dev/null
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexClientProvider.cs
@@ -0,0 +1,37 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using System.Collections.Concurrent;
+using Microsoft.Extensions.Options;
+
+namespace Squidex.ClientLibrary.ServiceExtensions;
+
+internal sealed class SquidexClientProvider : ISquidexClientProvider
+{
+    private readonly ConcurrentDictionary<string, ISquidexClient> clients = new ConcurrentDictionary<string, ISquidexClient>();
+    private readonly IOptionsMonitor<SquidexServiceOptions> optionsMonitor;
+
+    public SquidexClientProvider(IOptionsMonitor<SquidexServiceOptions> optionsMonitor)
+    {
+        this.optionsMonitor = optionsMonitor;
+    }
+
+    public ISquidexClient Get()
+    {
+        return Get(Options.DefaultName);
+    }
+
+    public ISquidexClient Get(string name)
+    {
+        return clients.GetOrAdd(name, (name, optionsMonitor) =>
+        {
+            var options = optionsMonitor.Get(name);
+
+            return new SquidexClient(options);
+        }, optionsMonitor);
+    }
+}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/OptionsValidator.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexOptionsValidator.cs
similarity index 90%
rename from csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/OptionsValidator.cs
rename to csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexOptionsValidator.cs
index c1453099..a57a4436 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/OptionsValidator.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.ServiceExtensions/SquidexOptionsValidator.cs
@@ -9,7 +9,7 @@
 
 namespace Squidex.ClientLibrary.ServiceExtensions;
 
-internal sealed class OptionsValidator : IValidateOptions<SquidexServiceOptions>
+internal sealed class SquidexOptionsValidator : IValidateOptions<SquidexServiceOptions>
 {
     public ValidateOptionsResult Validate(string? name, SquidexServiceOptions options)
     {
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/AssetFolderTreeTests.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/AssetFolderTreeTests.cs
index b51e18d2..a9052dab 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/AssetFolderTreeTests.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/AssetFolderTreeTests.cs
@@ -19,7 +19,7 @@ public class AssetFolderTreeTests
 
     public AssetFolderTreeTests()
     {
-        sut = new AssetFolderTree(assets, "my-app");
+        sut = new AssetFolderTree(assets);
     }
 
     [Theory]
@@ -54,7 +54,7 @@ public async Task Should_query_for_path_once_for_each_subtree()
             FolderName = "folder2"
         };
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", folder1.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(folder1.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
             .Returns(new AssetFoldersDto
             {
                 Items = new List<AssetFolderDto>(),
@@ -64,7 +64,7 @@ public async Task Should_query_for_path_once_for_each_subtree()
                 }
             });
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", folder2.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(folder2.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
             .Returns(new AssetFoldersDto
             {
                 Items = new List<AssetFolderDto>(),
@@ -77,7 +77,7 @@ public async Task Should_query_for_path_once_for_each_subtree()
         Assert.Equal("folder1", await sut.GetPathAsync(folder1.Id));
         Assert.Equal("folder2", await sut.GetPathAsync(folder2.Id));
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
             .MustHaveHappenedTwiceExactly();
     }
 
@@ -98,7 +98,7 @@ public async Task Should_not_query_for_path_again_if_child_already_queried()
             FolderName = "folder2"
         };
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", folder2.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(folder2.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
             .Returns(new AssetFoldersDto
             {
                 Items = new List<AssetFolderDto>(),
@@ -112,7 +112,7 @@ public async Task Should_not_query_for_path_again_if_child_already_queried()
         Assert.Equal("folder1/folder2", await sut.GetPathAsync(folder2.Id));
         Assert.Equal("folder1", await sut.GetPathAsync(folder1.Id));
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
             .MustHaveHappenedOnceExactly();
     }
 
@@ -133,7 +133,7 @@ public async Task Should_not_query_for_path_again_if_parent_already_queried()
             FolderName = "folder2"
         };
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", folder1.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(folder1.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
             .Returns(new AssetFoldersDto
             {
                 Items = new List<AssetFolderDto>
@@ -149,7 +149,7 @@ public async Task Should_not_query_for_path_again_if_parent_already_queried()
         Assert.Equal("folder1", await sut.GetPathAsync(folder1.Id));
         Assert.Equal("folder1/folder2", await sut.GetPathAsync(folder2.Id));
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
             .MustHaveHappenedOnceExactly();
     }
 
@@ -170,7 +170,7 @@ public async Task Should_query_for_id_once_for_each_tree_item()
             FolderName = "folder2"
         };
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", RootId, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(RootId, A<AssetFolderScope?>._, A<CancellationToken>._))
             .Returns(new AssetFoldersDto
             {
                 Items = new List<AssetFolderDto>
@@ -184,7 +184,7 @@ public async Task Should_query_for_id_once_for_each_tree_item()
         Assert.Equal(folder1.Id, await sut.GetIdAsync("folder1"));
         Assert.Equal(folder2.Id, await sut.GetIdAsync("folder2"));
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
             .MustHaveHappenedOnceExactly();
     }
 
@@ -205,7 +205,7 @@ public async Task Should_not_query_for_id_again_if_parent_already_queried()
             FolderName = "folder2"
         };
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", folder1.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(folder1.Id, A<AssetFolderScope?>._, A<CancellationToken>._))
             .Returns(new AssetFoldersDto
             {
                 Items = new List<AssetFolderDto>
@@ -221,7 +221,7 @@ public async Task Should_not_query_for_id_again_if_parent_already_queried()
         Assert.Equal("folder1", await sut.GetPathAsync(folder1.Id));
         Assert.Equal("folder1/folder2", await sut.GetPathAsync(folder2.Id));
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
             .MustHaveHappenedOnceExactly();
     }
 
@@ -242,7 +242,7 @@ public async Task Should_query_for_id_once_and_create_new_folder()
             FolderName = "folder2"
         };
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", RootId, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(RootId, A<AssetFolderScope?>._, A<CancellationToken>._))
             .Returns(new AssetFoldersDto
             {
                 Items = new List<AssetFolderDto>
@@ -252,7 +252,7 @@ public async Task Should_query_for_id_once_and_create_new_folder()
                 Path = new List<AssetFolderDto>()
             });
 
-        A.CallTo(() => assets.PostAssetFolderAsync("my-app",
+        A.CallTo(() => assets.PostAssetFolderAsync(
                 A<CreateAssetFolderDto>.That.Matches(x => x.FolderName == "folder2" && x.ParentId == RootId),
                 A<CancellationToken>._))
             .Returns(folder2);
@@ -260,7 +260,7 @@ public async Task Should_query_for_id_once_and_create_new_folder()
         Assert.Equal(folder1.Id, await sut.GetIdAsync("folder1"));
         Assert.Equal(folder2.Id, await sut.GetIdAsync("folder2"));
 
-        A.CallTo(() => assets.GetAssetFoldersAsync("my-app", A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
+        A.CallTo(() => assets.GetAssetFoldersAsync(A<string>._, A<AssetFolderScope?>._, A<CancellationToken>._))
             .MustHaveHappenedOnceExactly();
     }
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/BasicClientServiceTests.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/BasicClientServiceTests.cs
index afb69a39..99dfe824 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/BasicClientServiceTests.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/BasicClientServiceTests.cs
@@ -17,22 +17,12 @@ public async Task Should_query_content()
     {
         var sut = CreateSut();
 
-        var result = await sut.CreateDynamicContentsClient("blog").GetAsync();
+        var result = await sut.DynamicContents("blog").GetAsync();
 
         Assert.NotEmpty(result.Items);
     }
 
-    [Fact]
-    public async Task Should_query_content_with_overriden_credentials()
-    {
-        var sut = CreateSutWithOverridenCredentials();
-
-        var result = await sut.CreateDynamicContentsClient("blog").GetAsync();
-
-        Assert.NotEmpty(result.Items);
-    }
-
-    private static ISquidexClientManager CreateSut()
+    private static ISquidexClient CreateSut()
     {
         var sut =
            new ServiceCollection()
@@ -44,32 +34,7 @@ private static ISquidexClientManager CreateSut()
                    options.Url = "https://cloud.squidex.io";
                })
                .BuildServiceProvider()
-               .GetRequiredService<ISquidexClientManager>();
-
-        return sut;
-    }
-
-    private static ISquidexClientManager CreateSutWithOverridenCredentials()
-    {
-        var sut =
-           new ServiceCollection()
-               .AddSquidexClient(options =>
-               {
-                   options.AppName = "squidex-website";
-                   options.ClientId = "INVALID";
-                   options.ClientSecret = "INVALID";
-                   options.AppCredentials = new Dictionary<string, AppCredentials>
-                   {
-                       ["squidex-website"] = new AppCredentials
-                       {
-                           ClientId = "squidex-website:default",
-                           ClientSecret = "QGgqxd7bDHBTEkpC6fj8sbdPWgZrPrPfr3xzb3LKoec=",
-                       }
-                   };
-                   options.Url = "https://cloud.squidex.io";
-               })
-               .BuildServiceProvider()
-               .GetRequiredService<ISquidexClientManager>();
+               .GetRequiredService<ISquidexClient>();
 
         return sut;
     }
@@ -97,13 +62,13 @@ public async Task Should_not_try_authenticate_again_if_it_failed(int retryHours,
                         return counts;
                     }).Services
                .BuildServiceProvider()
-               .GetRequiredService<ISquidexClientManager>();
+               .GetRequiredService<ISquidexClient>();
 
         for (var i = 0; i < 10; i++)
         {
             try
             {
-                await sut.CreatePingClient().GetAppPingAsync("app");
+                await sut.Ping.GetAppPingAsync();
             }
             catch
             {
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/BasicClientTests.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/BasicClientTests.cs
index 6825696d..fc0a52e8 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/BasicClientTests.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/BasicClientTests.cs
@@ -12,11 +12,11 @@ namespace Squidex.ClientLibrary.Tests;
 
 public class BasicClientTests
 {
-    private readonly ISquidexClientManager sut;
+    private readonly ISquidexClient sut;
 
     public BasicClientTests()
     {
-        sut = new SquidexClientManager(new SquidexOptions
+        sut = new SquidexClient(new SquidexOptions
         {
             AppName = "squidex-website",
             ClientId = "squidex-website:reader",
@@ -27,23 +27,19 @@ public BasicClientTests()
     [Fact(Skip = "No permissions.")]
     public async Task Should_make_ping_api_request()
     {
-        var pingClient = sut.CreatePingClient();
-
-        await pingClient.GetAppPingAsync("squidex-website");
+        await sut.Ping.GetAppPingAsync();
     }
 
     [Fact]
     public async Task Should_make_ping_request()
     {
-        var pingClient = sut.CreatePingClient();
-
-        await pingClient.GetPingAsync();
+        await sut.Ping.GetPingAsync();
     }
 
     [Fact]
     public async Task Should_get_content()
     {
-        var result = await sut.CreateDynamicContentsClient("blog").GetAsync();
+        var result = await sut.DynamicContents("blog").GetAsync();
 
         Assert.NotEmpty(result.Items);
     }
@@ -53,7 +49,7 @@ public async Task Should_get_content_with_invalid_token()
     {
         ((CachingAuthenticator)sut.Options.Authenticator).SetToCache(sut.Options.AppName, "TOKEN", DateTime.MaxValue);
 
-        var result = await sut.CreateDynamicContentsClient("blog").GetAsync();
+        var result = await sut.DynamicContents("blog").GetAsync();
 
         Assert.NotEmpty(result.Items);
     }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SquidexClientManagerTests.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SquidexClientManagerTests.cs
index 24d5993e..9683a486 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SquidexClientManagerTests.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SquidexClientManagerTests.cs
@@ -6,16 +6,15 @@
 // ==========================================================================
 
 using Microsoft.Extensions.DependencyInjection;
+using Squidex.ClientLibrary.ServiceExtensions;
 using Xunit;
 
 namespace Squidex.ClientLibrary.Tests;
 
 public class SquidexClientManagerTests
 {
-    [Theory]
-    [InlineData("https://cloud.squidex.io")]
-    [InlineData("https://cloud.squidex.io/")]
-    public void Should_build_client_manager_from_service(string url)
+    [Fact]
+    public void Should_build_client_from_service()
     {
         var sut =
             new ServiceCollection()
@@ -23,15 +22,62 @@ public void Should_build_client_manager_from_service(string url)
                 {
                     options.AppName = "app";
                     options.ClientId = "id";
-                    options.ClientSecret = "secet";
-                    options.Url = url;
+                    options.ClientSecret = "secret";
+                    options.Url = "https://custom.squidex.io";
                 })
                 .BuildServiceProvider()
-                .GetRequiredService<ISquidexClientManager>();
+                .GetRequiredService<ISquidexClient>();
 
-        var result = sut.GenerateUrl("relative/url");
+        Assert.Equal("https://custom.squidex.io/", sut.Options.Url);
+    }
 
-        Assert.Equal("https://cloud.squidex.io/relative/url", result);
+    [Fact]
+    public void Should_build_client_from_service_with_custom_options()
+    {
+        var sut =
+            new ServiceCollection()
+                .AddSquidexClient(null)
+                .Configure<SquidexServiceOptions>(options =>
+                {
+                    options.AppName = "app";
+                    options.ClientId = "id";
+                    options.ClientSecret = "secret";
+                    options.Url = "https://custom.squidex.io";
+                })
+                .BuildServiceProvider()
+                .GetRequiredService<ISquidexClient>();
+
+        Assert.Equal("https://custom.squidex.io/", sut.Options.Url);
+    }
+
+    [Fact]
+    public void Should_build_client_from_named_service()
+    {
+        var provider =
+            new ServiceCollection()
+                .AddSquidexClient(null)
+                .Configure<SquidexServiceOptions>(options =>
+                {
+                    options.AppName = "app";
+                    options.ClientId = "id";
+                    options.ClientSecret = "secret";
+                    options.Url = "https://custom1.squidex.io";
+                })
+                .Configure<SquidexServiceOptions>("named", options =>
+                {
+                    options.AppName = "app";
+                    options.ClientId = "id";
+                    options.ClientSecret = "secret";
+                    options.Url = "https://custom2.squidex.io";
+                })
+                .BuildServiceProvider()
+                .GetRequiredService<ISquidexClientProvider>();
+
+        var sut1 = provider.Get();
+        var sut2 = provider.Get("named");
+
+        Assert.Equal("https://custom1.squidex.io/", sut1.Options.Url);
+        Assert.Equal("https://custom2.squidex.io/", sut2.Options.Url);
     }
 
     [Theory]
@@ -122,19 +168,19 @@ public void Should_throw_exception_if_asset_cdn_not_configured()
         Assert.Throws<InvalidOperationException>(() => sut.GenerateAssetCDNUrl("relative/url"));
     }
 
-    private static SquidexClientManager BuildClientManager(Action<SquidexOptions>? configure = null)
+    private static SquidexClient BuildClientManager(Action<SquidexOptions>? configure = null)
     {
         var options = new SquidexOptions
         {
             AppName = "app",
             ClientId = "id",
-            ClientSecret = "secet",
+            ClientSecret = "secret",
             Url = "https://squidex.io"
         };
 
         configure?.Invoke(options);
 
-        var sut = new SquidexClientManager(options);
+        var sut = new SquidexClient(options);
 
         return sut;
     }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SquidexOptionsTests.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SquidexOptionsTests.cs
index fd2f5886..bafc72ff 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SquidexOptionsTests.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SquidexOptionsTests.cs
@@ -30,10 +30,5 @@ public void Should_bind_to_config()
         Assert.Equal("My-App", options.AppName);
         Assert.Equal("My-ClientId", options.ClientId);
         Assert.Equal("My-ClientSecret", options.ClientSecret);
-
-        var appCredentials = options.AppCredentials!["My-App2"];
-
-        Assert.Equal("My-ClientId2", appCredentials.ClientId);
-        Assert.Equal("My-ClientSecret2", appCredentials.ClientSecret);
     }
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/AppCredentials.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/AppCredentials.cs
deleted file mode 100644
index feea6b3a..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/AppCredentials.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-namespace Squidex.ClientLibrary;
-
-/// <summary>
-/// Application specific credentials.
-/// </summary>
-public sealed class AppCredentials : OptionsBase
-{
-    private string clientId;
-    private string clientSecret;
-
-    /// <summary>
-    /// Gets or sets the client identifier.
-    /// </summary>
-    /// <value>
-    /// The client identifier. This is a required option.
-    /// </value>
-    /// <exception cref="InvalidOperationException">Option is frozen and cannot be changed anymore.</exception>
-    public string ClientId
-    {
-        get => clientId;
-        set => Set(ref clientId, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the client secret.
-    /// </summary>
-    /// <value>
-    /// The client secret. This is a required option.
-    /// </value>
-    /// <exception cref="InvalidOperationException">Option is frozen and cannot be changed anymore.</exception>
-    public string ClientSecret
-    {
-        get => clientSecret;
-        set => Set(ref clientSecret, value);
-    }
-
-    /// <summary>
-    /// Validates the options.
-    /// </summary>
-    public void CheckAndFreeze()
-    {
-        if (IsFrozen)
-        {
-            return;
-        }
-
-#pragma warning disable MA0015 // Specify the parameter name in ArgumentException
-        if (string.IsNullOrWhiteSpace(clientId))
-        {
-            throw new ArgumentException("Client id is not defined.", nameof(ClientId));
-        }
-
-        if (string.IsNullOrWhiteSpace(clientSecret))
-        {
-            throw new ArgumentException("Client secret is not defined.", nameof(ClientSecret));
-        }
-
-        Freeze();
-#pragma warning restore MA0015 // Specify the parameter name in ArgumentException
-    }
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/AssetFolderTree.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/AssetFolderTree.cs
index afde1b21..135cc88d 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/AssetFolderTree.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/AssetFolderTree.cs
@@ -20,23 +20,19 @@ public sealed class AssetFolderTree
     private static readonly string RootId = Guid.Empty.ToString();
     private readonly Dictionary<string, AssetFolderNode> nodes = new Dictionary<string, AssetFolderNode>();
     private readonly IAssetsClient assetsClient;
-    private readonly string appName;
     private readonly AssetFolderNode rootNode = new AssetFolderNode(RootId, string.Empty, string.Empty);
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AssetFolderTree"/> class.
     /// </summary>
     /// <param name="assetsClient">The assets client. Cannot be null.</param>
-    /// <param name="appName">The app name. Cannot be null.</param>
-    public AssetFolderTree(IAssetsClient assetsClient, string appName)
+    public AssetFolderTree(IAssetsClient assetsClient)
     {
         Guard.NotNull(assetsClient, nameof(assetsClient));
-        Guard.NotNull(appName, nameof(appName));
 
         nodes[RootId] = rootNode;
 
         this.assetsClient = assetsClient;
-        this.appName = appName;
     }
 
     /// <summary>
@@ -140,7 +136,7 @@ private async Task<AssetFolderNode> AddFolderAsync(AssetFolderNode current, stri
             ParentId = current.Id
         };
 
-        var folder = await assetsClient.PostAssetFolderAsync(appName, request);
+        var folder = await assetsClient.PostAssetFolderAsync(request);
 
         current = TryAdd(current, folder.Id, name);
         current.HasBeenQueried = true;
@@ -155,7 +151,7 @@ private async Task<AssetFolderNode> QueryAsync(string id, bool needsChildren)
             return node;
         }
 
-        var folders = await assetsClient.GetAssetFoldersAsync(appName, id);
+        var folders = await assetsClient.GetAssetFoldersAsync(id);
 
         var current = rootNode;
 
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/AcceptAllCertificatesConfigurator.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/AcceptAllCertificatesConfigurator.cs
deleted file mode 100644
index 6ded8451..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/AcceptAllCertificatesConfigurator.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-namespace Squidex.ClientLibrary.Configuration;
-
-/// <summary>
-/// Configures the HTTP client to accept all SSL certificates.
-/// </summary>
-/// <seealso cref="IHttpConfigurator" />
-public sealed class AcceptAllCertificatesConfigurator : IHttpConfigurator
-{
-    /// <summary>
-    /// The only instance of this class.
-    /// </summary>
-    public static readonly AcceptAllCertificatesConfigurator Instance = new AcceptAllCertificatesConfigurator();
-
-    private AcceptAllCertificatesConfigurator()
-    {
-    }
-
-    /// <inheritdoc/>
-    public void Configure(HttpClient httpClient)
-    {
-    }
-
-    /// <inheritdoc/>
-    public void Configure(HttpClientHandler httpClientHandler)
-    {
-        httpClientHandler.ServerCertificateCustomValidationCallback += (message, certificate, chain, errors) => true;
-    }
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/Authenticator.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/Authenticator.cs
index 7771711b..8ea44652 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/Authenticator.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/Authenticator.cs
@@ -56,43 +56,31 @@ public async Task<string> GetBearerTokenAsync(string appName,
         CancellationToken ct)
     {
         var httpClient = options.ClientProvider.Get();
-        try
-        {
-            var clientId = options.ClientId;
-            var clientSecret = options.ClientSecret;
 
-            if (options.AppCredentials != null && options.AppCredentials.TryGetValue(appName, out var credentials))
-            {
-                clientId = credentials.ClientId;
-                clientSecret = credentials.ClientSecret;
-            }
+        var clientId = options.ClientId;
+        var clientSecret = options.ClientSecret;
 
-            ThrowFromPreviousAttempt(clientId, clientSecret);
+        ThrowFromPreviousAttempt(clientId, clientSecret);
 
-            var httpRequest = BuildRequest(clientId, clientSecret);
+        var httpRequest = BuildRequest(clientId, clientSecret);
 
-            using (var response = await httpClient.SendAsync(httpRequest, ct))
+        using (var response = await httpClient.SendAsync(httpRequest, ct))
+        {
+            if (!response.IsSuccessStatusCode)
             {
-                if (!response.IsSuccessStatusCode)
-                {
-                    var exception = new SecurityException($"Failed to retrieve access token for client '{options.ClientId}', got HTTP {response.StatusCode}.");
+                var exception = new SecurityException($"Failed to retrieve access token for client '{options.ClientId}', got HTTP {response.StatusCode}.");
 
-                    StorePreviousAttempt(clientId, clientSecret, exception);
-                    throw exception;
-                }
+                StorePreviousAttempt(clientId, clientSecret, exception);
+                throw exception;
+            }
 #if NET5_0_OR_GREATER
-                var jsonString = await response.Content.ReadAsStringAsync(ct);
+            var jsonString = await response.Content.ReadAsStringAsync(ct);
 #else
-                var jsonString = await response.Content.ReadAsStringAsync();
+            var jsonString = await response.Content.ReadAsStringAsync();
 #endif
-                var jsonToken = JToken.Parse(jsonString);
+            var jsonToken = JToken.Parse(jsonString);
 
-                return jsonToken["access_token"]!.ToString();
-            }
-        }
-        finally
-        {
-            options.ClientProvider.Return(httpClient);
+            return jsonToken["access_token"]!.ToString();
         }
     }
 
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/GlobalContextClientFactory.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/GlobalContextClientFactory.cs
deleted file mode 100644
index c0b41c00..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/GlobalContextClientFactory.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-namespace Squidex.ClientLibrary.Configuration;
-
-/// <summary>
-/// A <see cref="IHttpClientFactory"/> that adds the context options to all requests.
-/// </summary>
-/// <seealso cref="IHttpClientFactory" />
-public sealed class GlobalContextClientFactory : IHttpClientFactory
-{
-    private readonly QueryContext context;
-
-    private sealed class ApplyHeadersHandler : DelegatingHandler
-    {
-        private readonly QueryContext context;
-
-        public ApplyHeadersHandler(QueryContext context)
-        {
-            this.context = context;
-        }
-
-        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            context?.AddToHeaders(request.Headers);
-
-            return base.SendAsync(request, cancellationToken);
-        }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="GlobalContextClientFactory"/> class with the context to apply.
-    /// </summary>
-    /// <param name="context">The context to apply.</param>
-    public GlobalContextClientFactory(QueryContext context)
-    {
-        this.context = context;
-    }
-
-    /// <inheritdoc/>
-    public HttpMessageHandler? CreateHttpMessageHandler(HttpMessageHandler inner)
-    {
-        return new ApplyHeadersHandler(context)
-        {
-            InnerHandler = inner
-        };
-    }
-
-    /// <inheritdoc/>
-    public HttpClient? CreateHttpClient(HttpMessageHandler messageHandler)
-    {
-        return null;
-    }
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpClientFactory.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpClientFactory.cs
deleted file mode 100644
index d81dfd00..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpClientFactory.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-namespace Squidex.ClientLibrary.Configuration;
-
-/// <summary>
-/// Optional interface to create new <see cref="HttpClient"/> instances.
-/// </summary>
-/// <remarks>
-/// Implement this class if you have custom requirements how the HTTP requests need to be done.
-/// </remarks>
-public interface IHttpClientFactory
-{
-    /// <summary>
-    /// Creates the HTTP client from the message.
-    /// </summary>
-    /// <param name="messageHandler">The message handler.</param>
-    /// <returns>
-    /// The HTTP client.
-    /// </returns>
-    HttpClient? CreateHttpClient(HttpMessageHandler messageHandler);
-
-    /// <summary>
-    /// Creates the HTTP message handler from the inner handler.
-    /// </summary>
-    /// <param name="inner">The inner handler.</param>
-    /// <returns>
-    /// The HTTP message handler.
-    /// </returns>
-    HttpMessageHandler? CreateHttpMessageHandler(HttpMessageHandler inner);
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpClientProvider.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpClientProvider.cs
index 15f40d33..b64b7192 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpClientProvider.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpClientProvider.cs
@@ -22,10 +22,4 @@ public interface IHttpClientProvider
     /// The HTTP client.
     /// </returns>
     HttpClient Get();
-
-    /// <summary>
-    /// Return a HTTP client.
-    /// </summary>
-    /// <param name="httpClient">The HTTP client to release.</param>
-    void Return(HttpClient httpClient);
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpConfigurator.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpConfigurator.cs
deleted file mode 100644
index 479fd525..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/IHttpConfigurator.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-namespace Squidex.ClientLibrary.Configuration;
-
-/// <summary>
-/// Implement this interface to change the behavior of HTTP requests.
-/// </summary>
-public interface IHttpConfigurator
-{
-    /// <summary>
-    /// Configures the specified HTTP client.
-    /// </summary>
-    /// <param name="httpClient">The HTTP client to configure.</param>
-    void Configure(HttpClient httpClient);
-
-    /// <summary>
-    /// Configures the specified HTTP client handler.
-    /// </summary>
-    /// <param name="httpClientHandler">The HTTP client handler to configure.</param>
-    void Configure(HttpClientHandler httpClientHandler);
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/NoopHttpConfigurator.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/NoopHttpConfigurator.cs
deleted file mode 100644
index 3c1b4f42..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/NoopHttpConfigurator.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-namespace Squidex.ClientLibrary.Configuration;
-
-/// <summary>
-/// Default implementation of the <see cref="IHttpClientFactory"/> and <see cref="IHttpConfigurator"/> that does
-/// not do anything and provides the default behavior.
-/// </summary>
-/// <seealso cref="IHttpConfigurator" />
-/// <seealso cref="IHttpClientFactory" />
-public sealed class NoopHttpConfigurator : IHttpConfigurator, IHttpClientFactory
-{
-    /// <summary>
-    /// The only instance of this class.
-    /// </summary>
-    public static readonly NoopHttpConfigurator Instance = new NoopHttpConfigurator();
-
-    private NoopHttpConfigurator()
-    {
-    }
-
-    /// <inheritdoc/>
-    public void Configure(HttpClient httpClient)
-    {
-    }
-
-    /// <inheritdoc/>
-    public void Configure(HttpClientHandler httpClientHandler)
-    {
-    }
-
-    /// <inheritdoc/>
-    public HttpClient? CreateHttpClient(HttpMessageHandler messageHandler)
-    {
-        return null;
-    }
-
-    /// <inheritdoc/>
-    public HttpMessageHandler? CreateHttpMessageHandler(HttpMessageHandler inner)
-    {
-        return inner;
-    }
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/StaticHttpClientProvider.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/StaticHttpClientProvider.cs
index f34fb673..37a9af2f 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/StaticHttpClientProvider.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Configuration/StaticHttpClientProvider.cs
@@ -12,9 +12,10 @@ namespace Squidex.ClientLibrary.Configuration;
 /// <summary>
 /// Provides a static instance.
 /// </summary>
-public sealed class StaticHttpClientProvider : IHttpClientProvider
+public class StaticHttpClientProvider : IHttpClientProvider
 {
-    private readonly HttpClient staticHttpClient;
+    private readonly SquidexOptions options;
+    private HttpClient? staticHttpClient;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="StaticHttpClientProvider"/> class.
@@ -24,45 +25,60 @@ public StaticHttpClientProvider(SquidexOptions options)
     {
         Guard.NotNull(options, nameof(options));
 
-        staticHttpClient = CreateClient(options);
+        this.options = options;
     }
 
-    private static HttpClient CreateClient(SquidexOptions options)
+    /// <summary>
+    /// Creates the client from the options.
+    /// </summary>
+    /// <param name="options">The options.</param>
+    /// <returns>
+    /// The created HTTP client.
+    /// </returns>
+    protected virtual HttpClient CreateHttpClient(SquidexOptions options)
     {
-        var handler = new HttpClientHandler();
+        var messageHandler = CreateMessageHandler(options);
 
-        options.Configurator.Configure(handler);
-
-        HttpMessageHandler messageHandler = new AuthenticatingHttpMessageHandler(options.Authenticator)
+        var httpClient = new HttpClient(messageHandler, false)
         {
-            InnerHandler = handler
+            BaseAddress = new Uri(options.Url, UriKind.Absolute)
         };
 
-        messageHandler = options.ClientFactory.CreateHttpMessageHandler(messageHandler) ?? messageHandler;
+        if (options.Timeout != null)
+        {
+            httpClient.Timeout = options.Timeout.Value;
+        }
 
-        var httpClient =
-            options.ClientFactory.CreateHttpClient(messageHandler) ??
-                new HttpClient(messageHandler, false);
+        return httpClient;
+    }
 
-        // Apply this setting afterwards, to override the value from the client factory.
-        httpClient.BaseAddress = new Uri(options.Url, UriKind.Absolute);
+    /// <summary>
+    /// Creates the client handler from the options.
+    /// </summary>
+    /// <param name="options">The options.</param>
+    /// <returns>
+    /// The created HTTP client handler.
+    /// </returns>
+    protected virtual HttpMessageHandler CreateMessageHandler(SquidexOptions options)
+    {
+        var innerHandler = new HttpClientHandler();
 
-        // Also override timeout when create from factory.
-        httpClient.Timeout = options.HttpClientTimeout;
+        if (options.IgnoreSelfSignedCertificates)
+        {
+            innerHandler.ServerCertificateCustomValidationCallback = (_, _, _, _) => true;
+        }
 
-        options.Configurator.Configure(httpClient);
+        var messageHandler = new AuthenticatingHttpMessageHandler(options)
+        {
+            InnerHandler = innerHandler
+        };
 
-        return httpClient;
+        return messageHandler;
     }
 
     /// <inheritdoc />
     public HttpClient Get()
     {
-        return staticHttpClient;
-    }
-
-    /// <inheritdoc />
-    public void Return(HttpClient httpClient)
-    {
+        return staticHttpClient ?? CreateHttpClient(options);
     }
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsClient.cs
index 819bc538..ccb86266 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsClient.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsClient.cs
@@ -24,20 +24,15 @@ namespace Squidex.ClientLibrary;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ContentsClient{TEntity, TData}"/> class
-    /// with the name of the schema, the options from the <see cref="SquidexClientManager"/> and the HTTP client.
+    /// with the name of the schema, the options from the <see cref="SquidexClient"/> and the HTTP client.
     /// </summary>
-    /// <param name="options">The options from the <see cref="SquidexClientManager"/>. Cannot be null.</param>
-    /// <param name="appName">Name of the app. Cannot be null or empty.</param>
+    /// <param name="options">The options from the <see cref="SquidexClient"/>. Cannot be null.</param>
     /// <param name="schemaName">Name of the schema. Cannot be null or empty.</param>
-    /// <param name="httpClientProvider">The HTTP client provider. Cannot be null.</param>
     /// <exception cref="ArgumentNullException"><paramref name="options"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="appName"/> is null.</exception>
     /// <exception cref="ArgumentNullException"><paramref name="schemaName"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="httpClientProvider"/> is null.</exception>
-    /// <exception cref="ArgumentException"><paramref name="appName"/> is empty.</exception>
     /// <exception cref="ArgumentException"><paramref name="schemaName"/> is empty.</exception>
-    public ContentsClient(SquidexOptions options, string appName, string schemaName, IHttpClientProvider httpClientProvider)
-        : base(options, appName, httpClientProvider)
+    public ContentsClient(SquidexOptions options, string schemaName)
+        : base(options)
     {
         Guard.NotNullOrEmpty(schemaName, nameof(schemaName));
 
@@ -91,57 +86,51 @@ public async Task StreamAllAsync(Func<TEntity, Task> callback, int skip = 0, Que
 
         context = (context ?? QueryContext.Default).WithoutTotal();
 
-        var httpClient = HttpClientProvider.Get();
-        try
+        var httpClient = Options.ClientProvider.Get();
+
+        using (var request = BuildRequest(HttpMethod.Get, BuildUrl($"stream?skip={skip}", false), null, context))
         {
-            using (var request = BuildRequest(HttpMethod.Get, BuildUrl($"stream?skip={skip}", false), null, context))
+            using (var response = await httpClient.SendAsync(request, ct))
             {
-                using (var response = await httpClient.SendAsync(request, ct))
-                {
-                    await EnsureResponseIsValidAsync(response);
+                await EnsureResponseIsValidAsync(response);
 
 #if NETSTANDARD2_0 || NETCOREAPP3_1
-                    using (var reader = new StreamReader(await response.Content.ReadAsStreamAsync()))
+                using (var reader = new StreamReader(await response.Content.ReadAsStreamAsync()))
 #else
-                    using (var reader = new StreamReader(await response.Content.ReadAsStreamAsync(ct)))
+                using (var reader = new StreamReader(await response.Content.ReadAsStreamAsync(ct)))
 #endif
-                    {
-                        string? line;
+                {
+                    string? line;
 #if NET7_0_OR_GREATER
-                        while ((line = await reader.ReadLineAsync(ct)) != null)
+                    while ((line = await reader.ReadLineAsync(ct)) != null)
 #else
-                        while ((line = await reader.ReadLineAsync()) != null)
+                    while ((line = await reader.ReadLineAsync()) != null)
 #endif
-                        {
-                            ct.ThrowIfCancellationRequested();
+                    {
+                        ct.ThrowIfCancellationRequested();
 
-                            if (string.IsNullOrWhiteSpace(line))
-                            {
-                                continue;
-                            }
+                        if (string.IsNullOrWhiteSpace(line))
+                        {
+                            continue;
+                        }
 
-                            const string Prefix = "data: ";
+                        const string Prefix = "data: ";
 
-                            if (!line.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
-                            {
-                                throw new SquidexException("Line does not start with data prefix.", 0, null);
-                            }
+                        if (!line.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
+                        {
+                            throw new SquidexException("Line does not start with data prefix.", 0, null);
+                        }
 
 #pragma warning disable IDE0057 // Use range operator
-                            var contentJson = line.Substring(Prefix.Length);
+                        var contentJson = line.Substring(Prefix.Length);
 #pragma warning restore IDE0057 // Use range operator
-                            var contentItem = contentJson.FromJson<TEntity>();
+                        var contentItem = contentJson.FromJson<TEntity>();
 
-                            await callback(contentItem);
-                        }
+                        await callback(contentItem);
                     }
                 }
             }
         }
-        finally
-        {
-            HttpClientProvider.Return(httpClient);
-        }
     }
 
     /// <inheritdoc/>
@@ -171,15 +160,6 @@ public Task<TEntity> GetAsync(string id, long version, QueryContext? context = n
         return RequestJsonAsync<TEntity>(HttpMethod.Get, BuildUrl($"{id}/?version={version}", true, context), null, context, ct);
     }
 
-    /// <inheritdoc/>
-    public Task<TData> GetDataAsync(string id, int version, QueryContext? context = null,
-         CancellationToken ct = default)
-    {
-        Guard.NotNullOrEmpty(id, nameof(id));
-
-        return RequestJsonAsync<TData>(HttpMethod.Get, BuildUrl($"{id}/{version}", true, context), null, context, ct);
-    }
-
     /// <inheritdoc/>
     public Task<ContentsResult<TEntity, TData>> GetReferencingAsync(TEntity entity, ContentQuery? query = null, QueryContext? context = null,
          CancellationToken ct = default)
@@ -372,11 +352,11 @@ private string BuildUrl(string path, bool query, QueryContext? context = null)
     {
         if (ShouldUseCDN(query, context))
         {
-            return $"{Options.ContentCDN}{AppName}/{SchemaName}/{path}";
+            return $"{Options.ContentCDN}{Options.AppName}/{SchemaName}/{path}";
         }
         else
         {
-            return $"api/content/{AppName}/{SchemaName}/{path}";
+            return $"api/content/{Options.AppName}/{SchemaName}/{path}";
         }
     }
 
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsSharedClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsSharedClient.cs
index 83dc5751..ffb10807 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsSharedClient.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ContentsSharedClient.cs
@@ -23,17 +23,12 @@ namespace Squidex.ClientLibrary;
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="ContentsSharedClient{TEntity, TData}"/> class
-    /// with the name of the schema, the options from the <see cref="SquidexClientManager"/> and the HTTP client.
+    /// with the name of the schema, the options from the <see cref="SquidexClient"/> and the HTTP client.
     /// </summary>
-    /// <param name="options">The options from the <see cref="SquidexClientManager"/>. Cannot be null.</param>
-    /// <param name="appName">Name of the app. Cannot be null or empty.</param>
-    /// <param name="httpClientProvider">The HTTP client provider. Cannot be null.</param>
+    /// <param name="options">The options from the <see cref="SquidexClient"/>. Cannot be null.</param>
     /// <exception cref="ArgumentNullException"><paramref name="options"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="appName"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="httpClientProvider"/> is null.</exception>
-    /// <exception cref="ArgumentException"><paramref name="appName"/> is empty.</exception>
-    public ContentsSharedClient(SquidexOptions options, string appName, IHttpClientProvider httpClientProvider)
-        : base(options, appName, httpClientProvider)
+    public ContentsSharedClient(SquidexOptions options)
+        : base(options)
     {
     }
 
@@ -107,11 +102,11 @@ private string BuildUrl(string path, bool query, QueryContext? context = null)
     {
         if (ShouldUseCDN(query, context))
         {
-            return $"{Options.ContentCDN}{AppName}/{path}";
+            return $"{Options.ContentCDN}{Options.AppName}/{path}";
         }
         else
         {
-            return $"api/content/{AppName}/{path}";
+            return $"api/content/{Options.AppName}/{path}";
         }
     }
 
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Status.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/EnrichedEvents/Status.cs
similarity index 98%
rename from csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Status.cs
rename to csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/EnrichedEvents/Status.cs
index 2c43e938..6020582e 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Status.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/EnrichedEvents/Status.cs
@@ -7,7 +7,7 @@
 
 using System.ComponentModel;
 
-namespace Squidex.ClientLibrary;
+namespace Squidex.ClientLibrary.EnrichedEvents;
 
 /// <summary>
 /// Default status strings.
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/StatusTypeConverter.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/EnrichedEvents/StatusTypeConverter.cs
similarity index 96%
rename from csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/StatusTypeConverter.cs
rename to csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/EnrichedEvents/StatusTypeConverter.cs
index 3c312128..e3500761 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/StatusTypeConverter.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/EnrichedEvents/StatusTypeConverter.cs
@@ -8,7 +8,7 @@
 using System.ComponentModel;
 using System.Globalization;
 
-namespace Squidex.ClientLibrary;
+namespace Squidex.ClientLibrary.EnrichedEvents;
 
 /// <summary>
 /// Converter for the Status.
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ExtendableRulesClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ExtendableRulesClient.cs
index 9a1aca59..769bdd6c 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ExtendableRulesClient.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ExtendableRulesClient.cs
@@ -19,17 +19,12 @@ public sealed class ExtendableRulesClient : SquidexClientBase, IExtendableRulesC
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="ExtendableRulesClient"/> class
-    /// with the name of the schema, the options from the <see cref="SquidexClientManager"/> and the HTTP client.
+    /// with the name of the schema, the options from the <see cref="SquidexClient"/> and the HTTP client.
     /// </summary>
-    /// <param name="options">The options from the <see cref="SquidexClientManager"/>. Cannot be null.</param>
-    /// <param name="appName">Name of the app. Cannot be null or empty.</param>
-    /// <param name="httpClientProvider">The HTTP client provider. Cannot be null.</param>
+    /// <param name="options">The options from the <see cref="SquidexClient"/>. Cannot be null.</param>
     /// <exception cref="ArgumentNullException"><paramref name="options"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="appName"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="httpClientProvider"/> is null.</exception>
-    /// <exception cref="ArgumentException"><paramref name="appName"/> is empty.</exception>
-    public ExtendableRulesClient(SquidexOptions options, string appName, IHttpClientProvider httpClientProvider)
-        : base(options, appName, httpClientProvider)
+    public ExtendableRulesClient(SquidexOptions options)
+        : base(options)
     {
     }
 
@@ -88,6 +83,6 @@ public Task DeleteRuleAsync(string id,
 
     private string BuildUrl(string? path = null)
     {
-        return $"api/apps/{AppName}/rules/{path}";
+        return $"api/apps/{Options.AppName}/rules/{path}";
     }
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/IContentsClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/IContentsClient.cs
index 10dcbc8e..8f1516cb 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/IContentsClient.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/IContentsClient.cs
@@ -14,14 +14,6 @@ namespace Squidex.ClientLibrary;
 /// <typeparam name="TData">The type that represents the data structure.</typeparam>
 public interface IContentsClient<TEntity, TData> where TEntity : Content<TData> where TData : class, new()
 {
-    /// <summary>
-    /// Gets the name of the app for which this client has been created.
-    /// </summary>
-    /// <value>
-    /// The name of the app for which this client has been created.
-    /// </value>
-    string AppName { get; }
-
     /// <summary>
     /// Gets the name of the schema for which this client has been created.
     /// </summary>
@@ -325,22 +317,6 @@ Task<TEntity> GetAsync(string id, QueryContext? context = null,
     Task<TEntity> GetAsync(string id, long version, QueryContext? context = null,
          CancellationToken ct = default);
 
-    /// <summary>
-    /// Gets a content item by ID and version.
-    /// </summary>
-    /// <param name="id">The ID of the content item. Cannot be null or empty.</param>
-    /// <param name="version">The version of the content.</param>
-    /// <param name="context">The context object to add additonal headers to the request and change the behavior of the API when querying content items.</param>
-    /// <param name="ct">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-    /// <returns>
-    /// The content item or null if not found.
-    /// </returns>
-    /// <exception cref="ArgumentNullException"><paramref name="id"/> is null.</exception>
-    /// <exception cref="ArgumentException"><paramref name="id"/> is empty.</exception>
-    [Obsolete("Use GetAsync with version.")]
-    Task<TData> GetDataAsync(string id, int version, QueryContext? context = null,
-         CancellationToken ct = default);
-
     /// <summary>
     /// Query content items by an optional query.
     /// </summary>
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/IContentsSharedClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/IContentsSharedClient.cs
index 8c40e33e..12eb3332 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/IContentsSharedClient.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/IContentsSharedClient.cs
@@ -14,14 +14,6 @@ namespace Squidex.ClientLibrary;
 /// <typeparam name="TData">The type that represents the data structure.</typeparam>
 public interface IContentsSharedClient<TEntity, TData> where TEntity : Content<TData> where TData : class, new()
 {
-    /// <summary>
-    /// Gets the name of the app for which this client has been created.
-    /// </summary>
-    /// <value>
-    /// The name of the app for which this client has been created.
-    /// </value>
-    string AppName { get; }
-
     /// <summary>
     /// Executes a bulk update.
     /// </summary>
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ISquidexClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ISquidexClient.cs
new file mode 100644
index 00000000..7a5e8c7e
--- /dev/null
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ISquidexClient.cs
@@ -0,0 +1,287 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Squidex.ClientLibrary.Management;
+
+namespace Squidex.ClientLibrary;
+
+/// <summary>
+/// Provides access to all endpoints through individual clients and handles authentication.
+/// </summary>
+public interface ISquidexClient
+{
+    /// <summary>
+    /// Gets the options that are used to initialize the client manager.
+    /// </summary>
+    /// <value>
+    /// The options that are used to initialize the client manager.
+    /// </value>
+    /// <remarks>
+    /// This object is frozen and cannot be changed later.
+    /// </remarks>
+    SquidexOptions Options { get; }
+
+    /// <summary>
+    /// Generates the URL to the image with the specified ID.
+    /// </summary>
+    /// <param name="id">The ID of the asset.</param>
+    /// <returns>
+    /// THe URL to the image.
+    /// </returns>
+    string? GenerateImageUrl(string? id);
+
+    /// <summary>
+    /// Generates the URL to the image with the first specified ID.
+    /// </summary>
+    /// <param name="id">The ID of the asset.</param>
+    /// <returns>
+    /// THe URL to the image.
+    /// </returns>
+    string? GenerateImageUrl(IEnumerable<string>? id);
+
+    /// <summary>
+    /// Generates an absolute URL.
+    /// </summary>
+    /// <param name="relativeUrl">The relative URL.</param>
+    /// <returns>
+    /// The absolute URL.
+    /// </returns>
+    string? GenerateUrl(string? relativeUrl);
+
+    /// <summary>
+    /// Generates an absolute URL for the asset CDN.
+    /// </summary>
+    /// <param name="relativeUrl">The relative URL.</param>
+    /// <exception cref="InvalidOperationException">Asset CDN not configured.</exception>
+    /// <returns>
+    /// The absolute URL.
+    /// </returns>
+    string? GenerateAssetCDNUrl(string relativeUrl);
+
+    /// <summary>
+    /// Generates an absolute URL for the content CDN.
+    /// </summary>
+    /// <param name="relativeUrl">The relative URL.</param>
+    /// <exception cref="InvalidOperationException">Content CDN not configured.</exception>
+    /// <returns>
+    /// The absolute URL.
+    /// </returns>
+    string? GenerateContentCDNUrl(string relativeUrl);
+
+    /// <summary>
+    /// Gets a client instance to query and manage app configuration.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IAppsClient Apps { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage assets.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IAssetsClient Assets { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage backups.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IBackupsClient Backups { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage comments.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    ICommentsClient Comments { get; }
+
+    /// <summary>
+    /// Gets a client instance to query diagnostics data.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IDiagnosticsClient Diagnostics { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage event consumers.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IEventConsumersClient EventConsumers { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage histories.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IHistoryClient History { get; }
+
+    /// <summary>
+    /// Gets a client instance to query all supported languages.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    /// <remarks>
+    /// Do not create new clients frequently.
+    /// </remarks>
+    ILanguagesClient Languages { get; }
+
+    /// <summary>
+    /// Gets a client instance to ping the server for monitoring.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IPingClient Ping { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage plans and subscriptions.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IPlansClient Plans { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage rules.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IRulesClient Rules { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage schemas.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    ISchemasClient Schemas { get; }
+
+    /// <summary>
+    /// Gets a client instance to make searches across content and records.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    ISearchClient Search { get; }
+
+    /// <summary>
+    /// Gets a client instance to query statistics.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IStatisticsClient Statistics { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage teams.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    ITeamsClient Teams { get; }
+
+    /// <summary>
+    /// Gets a client instance to query templates.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    ITemplatesClient Templates { get; }
+
+    /// <summary>
+    /// Gets a client instance to translate content.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    ITranslationsClient Translations { get; }
+
+    /// <summary>
+    /// Gets a client instance to query user information.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IUsersClient Users { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage users as administrator.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IUserManagementClient UserManagement { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage untyped rules.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IExtendableRulesClient ExtendableRules { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage contents across all schemas with dynamic data shape.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IContentsSharedClient<DynamicContent, DynamicData> SharedDynamicContents { get; }
+
+    /// <summary>
+    /// Gets a client instance to query and manage contents for a schema.
+    /// </summary>
+    /// <typeparam name="TEntity">The type for the content entity.</typeparam>
+    /// <typeparam name="TData">The type that represents the data structure.</typeparam>
+    /// <param name="schemaName">The name of the schema. Cannot be null or empty.</param>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    /// <exception cref="ArgumentNullException"><paramref name="schemaName"/> is null.</exception>
+    /// <exception cref="ArgumentException"><paramref name="schemaName"/> is empty.</exception>
+    IContentsClient<TEntity, TData> Contents<TEntity, TData>(string schemaName) where TEntity : Content<TData> where TData : class, new();
+
+    /// <summary>
+    /// Gets a client instance to query and manage contents for a schema with dynamic data shape.
+    /// </summary>
+    /// <param name="schemaName">The name of the schema. Cannot be null or empty.</param>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    /// <exception cref="ArgumentNullException"><paramref name="schemaName"/> is null.</exception>
+    /// <exception cref="ArgumentException"><paramref name="schemaName"/> is empty.</exception>
+    IContentsClient<DynamicContent, DynamicData> DynamicContents(string schemaName);
+
+    /// <summary>
+    /// Gets a client instance to query and manage contents across all schemas.
+    /// </summary>
+    /// <typeparam name="TEntity">The type for the content entity.</typeparam>
+    /// <typeparam name="TData">The type that represents the data structure.</typeparam>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    IContentsSharedClient<TEntity, TData> SharedContents<TEntity, TData>() where TEntity : Content<TData> where TData : class, new();
+
+    /// <summary>
+    /// Creates a <see cref="HttpClient"/> to make all kind of authorized requests.
+    /// </summary>
+    /// <returns>
+    /// The returned client.
+    /// </returns>
+    HttpClient CreateHttpClient();
+}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ISquidexClientManager.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ISquidexClientManager.cs
deleted file mode 100644
index a9bf1afa..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/ISquidexClientManager.cs
+++ /dev/null
@@ -1,412 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-using Squidex.ClientLibrary.Management;
-
-namespace Squidex.ClientLibrary;
-
-/// <summary>
-/// Provides access to all endpoints through individual clients and handles authentication.
-/// </summary>
-public interface ISquidexClientManager
-{
-    /// <summary>
-    /// Gets the options that are used to initialize the client manager.
-    /// </summary>
-    /// <value>
-    /// The options that are used to initialize the client manager.
-    /// </value>
-    /// <remarks>
-    /// This object is frozen and cannot be changed later.
-    /// </remarks>
-    SquidexOptions Options { get; }
-
-    /// <summary>
-    /// Gets the name of the App.
-    /// </summary>
-    /// <value>
-    /// The name of the App.
-    /// </value>
-    string App { get; }
-
-    /// <summary>
-    /// Generates the URL to the image with the specified ID.
-    /// </summary>
-    /// <param name="id">The ID of the asset.</param>
-    /// <returns>
-    /// THe URL to the image.
-    /// </returns>
-    string? GenerateImageUrl(string? id);
-
-    /// <summary>
-    /// Generates the URL to the image with the first specified ID.
-    /// </summary>
-    /// <param name="id">The ID of the asset.</param>
-    /// <returns>
-    /// THe URL to the image.
-    /// </returns>
-    string? GenerateImageUrl(IEnumerable<string>? id);
-
-    /// <summary>
-    /// Generates an absolute URL.
-    /// </summary>
-    /// <param name="relativeUrl">The relative URL.</param>
-    /// <returns>
-    /// The absolute URL.
-    /// </returns>
-    string? GenerateUrl(string? relativeUrl);
-
-    /// <summary>
-    /// Generates an absolute URL for the asset CDN.
-    /// </summary>
-    /// <param name="relativeUrl">The relative URL.</param>
-    /// <exception cref="InvalidOperationException">Asset CDN not configured.</exception>
-    /// <returns>
-    /// The absolute URL.
-    /// </returns>
-    string? GenerateAssetCDNUrl(string relativeUrl);
-
-    /// <summary>
-    /// Generates an absolute URL for the content CDN.
-    /// </summary>
-    /// <param name="relativeUrl">The relative URL.</param>
-    /// <exception cref="InvalidOperationException">Content CDN not configured.</exception>
-    /// <returns>
-    /// The absolute URL.
-    /// </returns>
-    string? GenerateContentCDNUrl(string relativeUrl);
-
-    /// <summary>
-    /// Creates a client instance to query and manage app configuration.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IAppsClient CreateAppsClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage assets.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IAssetsClient CreateAssetsClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage backups.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IBackupsClient CreateBackupsClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage comments.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    ICommentsClient CreateCommentsClient();
-
-    /// <summary>
-    /// Creates a client instance to query diagnostics data.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IDiagnosticsClient CreateDiagnosticsClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage event consumers.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IEventConsumersClient CreateEventConsumersClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage histories.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IHistoryClient CreateHistoryClient();
-
-    /// <summary>
-    /// Creates a client instance to query all supported languages.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    ILanguagesClient CreateLanguagesClient();
-
-    /// <summary>
-    /// Creates a client instance to ping the server for monitoring.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IPingClient CreatePingClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage plans and subscriptions.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IPlansClient CreatePlansClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage rules.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IRulesClient CreateRulesClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage schemas.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    ISchemasClient CreateSchemasClient();
-
-    /// <summary>
-    /// Creates a client instance to make searches across content and records.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    ISearchClient CreateSearchClient();
-
-    /// <summary>
-    /// Creates a client instance to query statistics.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IStatisticsClient CreateStatisticsClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage teams.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    ITeamsClient CreateTeamsClient();
-
-    /// <summary>
-    /// Creates a client instance to query templates.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    ITemplatesClient CreateTemplatesClient();
-
-    /// <summary>
-    /// Creates a client instance to translate content.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    ITranslationsClient CreateTranslationsClient();
-
-    /// <summary>
-    /// Creates a client instance to query user information.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IUsersClient CreateUsersClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage users as administrator.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IUserManagementClient CreateUserManagementClient();
-
-    /// <summary>
-    /// Creates a client instance to query and manage untyped rules.
-    /// </summary>
-    /// <param name="appName">The optional app name.</param>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IExtendableRulesClient CreateExtendableRulesClient(string? appName = null);
-
-    /// <summary>
-    /// Creates a client instance to query and manage contents for a schema.
-    /// </summary>
-    /// <typeparam name="TEntity">The type for the content entity.</typeparam>
-    /// <typeparam name="TData">The type that represents the data structure.</typeparam>
-    /// <param name="schemaName">The name of the schema. Cannot be null or empty.</param>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <exception cref="ArgumentNullException"><paramref name="schemaName"/> is null.</exception>
-    /// <exception cref="ArgumentException"><paramref name="schemaName"/> is empty.</exception>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IContentsClient<TEntity, TData> CreateContentsClient<TEntity, TData>(string schemaName) where TEntity : Content<TData> where TData : class, new();
-
-    /// <summary>
-    /// Creates a client instance to query and manage contents for an app and schema.
-    /// </summary>
-    /// <typeparam name="TEntity">The type for the content entity.</typeparam>
-    /// <typeparam name="TData">The type that represents the data structure.</typeparam>
-    /// <param name="appName">The name of the app. Cannot be null or empty.</param>
-    /// <param name="schemaName">The name of the schema. Cannot be null or empty.</param>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <exception cref="ArgumentNullException"><paramref name="appName"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="schemaName"/> is null.</exception>
-    /// <exception cref="ArgumentException"><paramref name="appName"/> is empty.</exception>
-    /// <exception cref="ArgumentException"><paramref name="schemaName"/> is empty.</exception>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IContentsClient<TEntity, TData> CreateContentsClient<TEntity, TData>(string appName, string schemaName) where TEntity : Content<TData> where TData : class, new();
-
-    /// <summary>
-    /// Creates a client instance to query and manage contents for a schema with dynamic data shape.
-    /// </summary>
-    /// <param name="schemaName">The name of the schema. Cannot be null or empty.</param>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <exception cref="ArgumentNullException"><paramref name="schemaName"/> is null.</exception>
-    /// <exception cref="ArgumentException"><paramref name="schemaName"/> is empty.</exception>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IContentsClient<DynamicContent, DynamicData> CreateDynamicContentsClient(string schemaName);
-
-    /// <summary>
-    /// Creates a client instance to query and manage contents for an app and schema with dynamic data shape.
-    /// </summary>
-    /// <param name="appName">The name of the app. Cannot be null or empty.</param>
-    /// <param name="schemaName">The name of the schema. Cannot be null or empty.</param>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <exception cref="ArgumentNullException"><paramref name="appName"/> is null.</exception>
-    /// <exception cref="ArgumentNullException"><paramref name="schemaName"/> is null.</exception>
-    /// <exception cref="ArgumentException"><paramref name="appName"/> is empty.</exception>
-    /// <exception cref="ArgumentException"><paramref name="schemaName"/> is empty.</exception>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IContentsClient<DynamicContent, DynamicData> CreateDynamicContentsClient(string appName, string schemaName);
-
-    /// <summary>
-    /// Creates a client instance to query and manage contents across all schemas.
-    /// </summary>
-    /// <typeparam name="TEntity">The type for the content entity.</typeparam>
-    /// <typeparam name="TData">The type that represents the data structure.</typeparam>
-    /// <param name="appName">The optional app name.</param>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IContentsSharedClient<TEntity, TData> CreateSharedContentsClient<TEntity, TData>(string? appName = null) where TEntity : Content<TData> where TData : class, new();
-
-    /// <summary>
-    /// Creates a client instance to query and manage contents across all schemas with dynamic data shape.
-    /// </summary>
-    /// <param name="appName">The optional app name.</param>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Do not create new clients frequently.
-    /// </remarks>
-    IContentsSharedClient<DynamicContent, DynamicData> CreateSharedDynamicContentsClient(string? appName = null);
-
-    /// <summary>
-    /// Creates a <see cref="HttpClient"/> to make all kind of authorized requests.
-    /// </summary>
-    /// <returns>
-    /// The created client.
-    /// </returns>
-    /// <remarks>
-    /// Remember to return the client after each request.
-    /// </remarks>
-    HttpClient CreateHttpClient();
-
-    /// <summary>
-    /// Returns the http client.
-    /// </summary>
-    /// <param name="httpClient">The HTTP client to return.</param>
-    void ReturnHttpClient(HttpClient httpClient);
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Management/AssetsClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Management/AssetsClient.cs
index ab074522..d8eee125 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Management/AssetsClient.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Management/AssetsClient.cs
@@ -17,19 +17,17 @@ public partial interface IAssetsClient
     /// <summary>
     /// Gets the upload progress.
     /// </summary>
-    /// <param name="app">The name of the app.</param>
     /// <param name="fileId">The file id of the upload.</param>
     /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
     /// <returns>
     /// The upload progress in bytes.
     /// </returns>
-    Task<long> GetUploadProgressAsync(string app, string fileId,
+    Task<long> GetUploadProgressAsync(string fileId,
         CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Upload a new asset using tus protocol.
     /// </summary>
-    /// <param name="app">The name of the app.</param>
     /// <param name="file">The file to upload.</param>
     /// <param name="options">Optional arguments.</param>
     /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
@@ -37,24 +35,22 @@ Task<long> GetUploadProgressAsync(string app, string fileId,
     /// Task for completion.
     /// </returns>
     /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-    Task UploadAssetAsync(string app, FileParameter file, AssetUploadOptions options = default,
+    Task UploadAssetAsync(FileParameter file, AssetUploadOptions options = default,
         CancellationToken cancellationToken = default);
 
     /// <summary>Get assets.</summary>
-    /// <param name="app">The name of the app.</param>
     /// <param name="query">The optional asset query.</param>
     /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
     /// <returns>
     /// Assets returned.
     /// </returns>
     /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-    Task<AssetsDto> GetAssetsAsync(string app, AssetQuery? query = null,
+    Task<AssetsDto> GetAssetsAsync(AssetQuery? query = null,
         CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Get assets.
     /// </summary>
-    /// <param name="app">The name of the app.</param>
     /// <param name="callback">The callback that is invoke for each asset.</param>
     /// <param name="batchSize">The number of assets per request.</param>
     /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
@@ -62,13 +58,12 @@ Task<AssetsDto> GetAssetsAsync(string app, AssetQuery? query = null,
     /// Assets returned.
     /// </returns>
     /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-    Task GetAllAsync(string app, Func<AssetDto, Task> callback, int batchSize = 200,
+    Task GetAllAsync(Func<AssetDto, Task> callback, int batchSize = 200,
         CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Get assets.
     /// </summary>
-    /// <param name="app">The name of the app.</param>
     /// <param name="callback">The callback that is invoke for each asset.</param>
     /// <param name="query">The optional asset query.</param>
     /// <param name="batchSize">The number of assets per request.</param>
@@ -77,7 +72,7 @@ Task GetAllAsync(string app, Func<AssetDto, Task> callback, int batchSize = 200,
     /// Assets returned.
     /// </returns>
     /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-    Task GetAllByQueryAsync(string app, Func<AssetDto, Task> callback, AssetQuery? query = null, int batchSize = 200,
+    Task GetAllByQueryAsync(Func<AssetDto, Task> callback, AssetQuery? query = null, int batchSize = 200,
         CancellationToken cancellationToken = default);
 }
 
@@ -96,59 +91,47 @@ public partial class AssetsClient
     }
 
     /// <inheritdoc />
-    public async Task<long> GetUploadProgressAsync(string app, string fileId,
+    public async Task<long> GetUploadProgressAsync(string fileId,
         CancellationToken cancellationToken = default)
     {
         Guard.NotNull(fileId, nameof(fileId));
 
-        var url = $"api/apps/{app}/assets/tus/";
+        var url = $"api/apps/{_options.AppName}/assets/tus/";
 
-        var httpClient = _httpClientProvider.Get();
-        try
-        {
-            return await httpClient.GetUploadProgressAsync(url, fileId, cancellationToken);
-        }
-        finally
-        {
-            _httpClientProvider.Return(httpClient);
-        }
+        var httpClient = _options.ClientProvider.Get();
+
+        return await httpClient.GetUploadProgressAsync(url, fileId, cancellationToken);
     }
 
     /// <inheritdoc />
-    public async Task UploadAssetAsync(string app, FileParameter file, AssetUploadOptions options = default,
+    public async Task UploadAssetAsync(FileParameter file, AssetUploadOptions options = default,
         CancellationToken cancellationToken = default)
     {
         Guard.NotNull(file, nameof(file));
 
-        var url = $"api/apps/{app}/assets/tus";
+        var url = $"api/apps/{_options.AppName}/assets/tus";
 
-        var httpClient = _httpClientProvider.Get();
-        try
-        {
-            await httpClient.UploadWithProgressAsync(url, file.ToUploadFile(), options.ToOptions(this), cancellationToken);
-        }
-        finally
-        {
-            _httpClientProvider.Return(httpClient);
-        }
+        var httpClient = _options.ClientProvider.Get();
+
+        await httpClient.UploadWithProgressAsync(url, file.ToUploadFile(), options.ToOptions(this), cancellationToken);
     }
 
     /// <inheritdoc />
-    public Task<AssetsDto> GetAssetsAsync(string app, AssetQuery? query = null,
+    public Task<AssetsDto> GetAssetsAsync(AssetQuery? query = null,
         CancellationToken cancellationToken = default)
     {
-        return GetAssetsAsync(app, query?.Top, query?.Skip, query?.OrderBy, query?.Filter, query?.ParentId, query?.ToIdString(), query?.ToQueryJson(), cancellationToken);
+        return GetAssetsAsync(query?.Top, query?.Skip, query?.OrderBy, query?.Filter, query?.ParentId, query?.ToIdString(), query?.ToQueryJson(), cancellationToken);
     }
 
     /// <inheritdoc />
-    public Task GetAllAsync(string app, Func<AssetDto, Task> callback, int batchSize = 200,
+    public Task GetAllAsync(Func<AssetDto, Task> callback, int batchSize = 200,
         CancellationToken cancellationToken = default)
     {
-        return GetAllByQueryAsync(app, callback, null, batchSize, cancellationToken);
+        return GetAllByQueryAsync(callback, null, batchSize, cancellationToken);
     }
 
     /// <inheritdoc />
-    public async Task GetAllByQueryAsync(string app, Func<AssetDto, Task> callback, AssetQuery? query = null, int batchSize = 200,
+    public async Task GetAllByQueryAsync(Func<AssetDto, Task> callback, AssetQuery? query = null, int batchSize = 200,
         CancellationToken cancellationToken = default)
     {
         Guard.Between(batchSize, 10, 10_000, nameof(batchSize));
@@ -163,7 +146,7 @@ public async Task GetAllByQueryAsync(string app, Func<AssetDto, Task> callback,
         {
             var isAnyAdded = false;
 
-            var getResult = await GetAssetsAsync(app, query, cancellationToken);
+            var getResult = await GetAssetsAsync(query, cancellationToken);
 
             foreach (var item in getResult.Items)
             {
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Management/Generated.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Management/Generated.cs
index 090e672e..ccdd03f3 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Management/Generated.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Management/Generated.cs
@@ -92,12 +92,12 @@ public partial interface IUserManagementClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class UserManagementClient : IUserManagementClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public UserManagementClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public UserManagementClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -129,6 +129,7 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/user-management?");
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (query != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("query") + "=").Append(System.Uri.EscapeDataString(ConvertToString(query, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
@@ -143,12 +144,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -207,7 +207,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -225,13 +224,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/user-management");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -304,7 +303,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -322,14 +320,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/user-management/{id}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -394,7 +392,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -416,14 +413,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/user-management/{id}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -502,7 +499,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -520,14 +516,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/user-management/{id}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -606,7 +602,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -624,14 +619,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/user-management/{id}/lock");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -717,7 +712,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -735,14 +729,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/user-management/{id}/unlock");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -828,7 +822,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -845,8 +838,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -854,7 +845,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -982,12 +973,12 @@ public partial interface IUsersClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class UsersClient : IUsersClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public UsersClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public UsersClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -1016,13 +1007,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -1081,7 +1072,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -1099,18 +1089,18 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/users?");
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (query != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("query") + "=").Append(System.Uri.EscapeDataString(ConvertToString(query, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -1169,7 +1159,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -1187,14 +1176,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/users/{id}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -1259,7 +1248,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -1277,14 +1265,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/users/{id}/picture");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/octet-stream"));
 
@@ -1347,7 +1335,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -1364,8 +1351,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -1373,7 +1358,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -1462,23 +1447,22 @@ public partial interface ITranslationsClient
         /// <summary>
         /// Translate a text.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The translation request.</param>
         /// <returns>Text translated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<TranslationDto> PostTranslationAsync(string app, TranslateDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<TranslationDto> PostTranslationAsync(TranslateDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class TranslationsClient : ITranslationsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public TranslationsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public TranslationsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -1501,30 +1485,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Translate a text.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The translation request.</param>
         /// <returns>Text translated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<TranslationDto> PostTranslationAsync(string app, TranslateDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<TranslationDto> PostTranslationAsync(TranslateDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/translations");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -1597,7 +1574,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -1614,8 +1590,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -1623,7 +1597,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -1730,12 +1704,12 @@ public partial interface ITemplatesClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class TemplatesClient : ITemplatesClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public TemplatesClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public TemplatesClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -1764,13 +1738,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/templates");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -1829,7 +1803,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -1847,14 +1820,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/templates/{name}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{name}", System.Uri.EscapeDataString(ConvertToString(name, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -1919,7 +1892,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -1936,8 +1908,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -1945,7 +1915,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -2117,12 +2087,12 @@ public partial interface ITeamsClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class TeamsClient : ITeamsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public TeamsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public TeamsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -2155,14 +2125,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/contributors");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -2227,7 +2197,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -2249,14 +2218,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/contributors");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -2335,7 +2304,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -2353,14 +2321,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/contributors/me");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -2435,7 +2403,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -2457,15 +2424,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/contributors/{id}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -2540,7 +2507,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -2558,13 +2524,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -2623,7 +2589,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -2645,13 +2610,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -2734,7 +2699,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -2752,14 +2716,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -2824,7 +2788,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -2846,14 +2809,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -2932,7 +2895,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -2949,8 +2911,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -2958,7 +2918,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -3047,21 +3007,19 @@ public partial interface IStatisticsClient
         /// <summary>
         /// Get api calls as log file.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Usage tracking results returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<LogDownloadDto> GetLogAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<LogDownloadDto> GetLogAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get api calls in date range.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="fromDate">The from date.</param>
         /// <param name="toDate">The to date.</param>
         /// <returns>API call returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<CallsUsageDtoDto> GetUsagesAsync(string app, System.DateTimeOffset fromDate, System.DateTimeOffset toDate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<CallsUsageDtoDto> GetUsagesAsync(System.DateTimeOffset fromDate, System.DateTimeOffset toDate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -3078,10 +3036,9 @@ public partial interface IStatisticsClient
         /// <summary>
         /// Get total asset size.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Storage usage returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<CurrentStorageDto> GetCurrentStorageSizeAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<CurrentStorageDto> GetCurrentStorageSizeAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -3096,12 +3053,11 @@ public partial interface IStatisticsClient
         /// <summary>
         /// Get asset usage by date.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="fromDate">The from date.</param>
         /// <param name="toDate">The to date.</param>
         /// <returns>Storage usage returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<StorageUsagePerDateDto>> GetStorageSizesAsync(string app, System.DateTimeOffset fromDate, System.DateTimeOffset toDate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<StorageUsagePerDateDto>> GetStorageSizesAsync(System.DateTimeOffset fromDate, System.DateTimeOffset toDate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -3119,12 +3075,12 @@ public partial interface IStatisticsClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class StatisticsClient : IStatisticsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public StatisticsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public StatisticsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -3147,26 +3103,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get api calls as log file.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Usage tracking results returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<LogDownloadDto> GetLogAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<LogDownloadDto> GetLogAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/usages/log");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -3231,7 +3180,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -3239,16 +3187,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get api calls in date range.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="fromDate">The from date.</param>
         /// <param name="toDate">The to date.</param>
         /// <returns>API call returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<CallsUsageDtoDto> GetUsagesAsync(string app, System.DateTimeOffset fromDate, System.DateTimeOffset toDate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<CallsUsageDtoDto> GetUsagesAsync(System.DateTimeOffset fromDate, System.DateTimeOffset toDate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (fromDate == null)
                 throw new System.ArgumentNullException("fromDate");
 
@@ -3257,18 +3201,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/usages/calls/{fromDate}/{toDate}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{fromDate}", System.Uri.EscapeDataString(fromDate.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{toDate}", System.Uri.EscapeDataString(toDate.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -3333,7 +3274,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -3359,16 +3299,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/usages/calls/{fromDate}/{toDate}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{fromDate}", System.Uri.EscapeDataString(fromDate.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{toDate}", System.Uri.EscapeDataString(toDate.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -3433,7 +3373,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -3441,26 +3380,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get total asset size.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Storage usage returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<CurrentStorageDto> GetCurrentStorageSizeAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<CurrentStorageDto> GetCurrentStorageSizeAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/usages/storage/today");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -3525,7 +3457,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -3543,14 +3474,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/usages/storage/today");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -3615,7 +3546,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -3623,16 +3553,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get asset usage by date.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="fromDate">The from date.</param>
         /// <param name="toDate">The to date.</param>
         /// <returns>Storage usage returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<StorageUsagePerDateDto>> GetStorageSizesAsync(string app, System.DateTimeOffset fromDate, System.DateTimeOffset toDate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<StorageUsagePerDateDto>> GetStorageSizesAsync(System.DateTimeOffset fromDate, System.DateTimeOffset toDate, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (fromDate == null)
                 throw new System.ArgumentNullException("fromDate");
 
@@ -3641,18 +3567,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/usages/storage/{fromDate}/{toDate}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{fromDate}", System.Uri.EscapeDataString(fromDate.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{toDate}", System.Uri.EscapeDataString(toDate.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -3717,7 +3640,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -3743,16 +3665,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/usages/storage/{fromDate}/{toDate}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{fromDate}", System.Uri.EscapeDataString(fromDate.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{toDate}", System.Uri.EscapeDataString(toDate.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -3817,7 +3739,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -3834,8 +3755,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -3843,7 +3762,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -3932,23 +3851,22 @@ public partial interface ISearchClient
         /// <summary>
         /// Get search results.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="query">The search query.</param>
         /// <returns>Search results returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<SearchResultDto>> GetSearchResultsAsync(string app, string query = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<SearchResultDto>> GetSearchResultsAsync(string query = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class SearchClient : ISearchClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public SearchClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public SearchClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -3971,32 +3889,25 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get search results.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="query">The search query.</param>
         /// <returns>Search results returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<SearchResultDto>> GetSearchResultsAsync(string app, string query = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<SearchResultDto>> GetSearchResultsAsync(string query = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/search?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (query != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("query") + "=").Append(System.Uri.EscapeDataString(ConvertToString(query, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -4061,7 +3972,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -4078,8 +3988,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -4087,7 +3995,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -4176,106 +4084,97 @@ public partial interface ISchemasClient
         /// <summary>
         /// Add a schema field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The field object that needs to be added to the schema.</param>
         /// <returns>Schema field created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PostFieldAsync(string app, string schema, AddFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PostFieldAsync(string schema, AddFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Add a nested field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="request">The field object that needs to be added to the schema.</param>
         /// <returns>Schema field created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PostNestedFieldAsync(string app, string schema, long parentId, AddFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PostNestedFieldAsync(string schema, long parentId, AddFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Configure UI fields.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The request that contains the field names.</param>
         /// <returns>Schema UI fields defined.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutSchemaUIFieldsAsync(string app, string schema, ConfigureUIFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutSchemaUIFieldsAsync(string schema, ConfigureUIFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Reorder all fields.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The request that contains the field ids.</param>
         /// <returns>Schema fields reordered.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutSchemaFieldOrderingAsync(string app, string schema, ReorderFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutSchemaFieldOrderingAsync(string schema, ReorderFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Reorder all nested fields.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="request">The request that contains the field ids.</param>
         /// <returns>Schema fields reordered.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutNestedFieldOrderingAsync(string app, string schema, long parentId, ReorderFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutNestedFieldOrderingAsync(string schema, long parentId, ReorderFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update a schema field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to update.</param>
         /// <param name="request">The field object that needs to be added to the schema.</param>
         /// <returns>Schema field updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutFieldAsync(string app, string schema, long id, UpdateFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutFieldAsync(string schema, long id, UpdateFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete a schema field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to disable.</param>
         /// <returns>Schema field deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> DeleteFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> DeleteFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update a nested field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to update.</param>
         /// <param name="request">The field object that needs to be added to the schema.</param>
         /// <returns>Schema field updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutNestedFieldAsync(string app, string schema, long parentId, long id, UpdateFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutNestedFieldAsync(string schema, long parentId, long id, UpdateFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete a nested field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to disable.</param>
         /// <returns>Schema field deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> DeleteNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> DeleteNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4284,12 +4183,11 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A locked field cannot be updated or deleted.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to lock.</param>
         /// <returns>Schema field shown.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> LockFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> LockFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4298,13 +4196,12 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A locked field cannot be edited or deleted.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to lock.</param>
         /// <returns>Schema field hidden.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> LockNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> LockNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4313,12 +4210,11 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A hidden field is not part of the API response, but can still be edited in the portal.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to hide.</param>
         /// <returns>Schema field hidden.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> HideFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> HideFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4327,13 +4223,12 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A hidden field is not part of the API response, but can still be edited in the portal.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to hide.</param>
         /// <returns>Schema field hidden.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> HideNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> HideNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4342,12 +4237,11 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A hidden field is not part of the API response, but can still be edited in the portal.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to show.</param>
         /// <returns>Schema field shown.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> ShowFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> ShowFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4356,13 +4250,12 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A hidden field is not part of the API response, but can still be edited in the portal.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to show.</param>
         /// <returns>Schema field shown.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> ShowNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> ShowNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4371,12 +4264,11 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to enable.</param>
         /// <returns>Schema field enabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> EnableFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> EnableFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4385,13 +4277,12 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to enable.</param>
         /// <returns>Schema field enabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> EnableNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> EnableNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4400,12 +4291,11 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to disable.</param>
         /// <returns>Schema field disabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> DisableFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> DisableFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -4414,150 +4304,137 @@ public partial interface ISchemasClient
         /// <remarks>
         /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to disable.</param>
         /// <returns>Schema field disabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> DisableNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> DisableNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get schemas.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Schemas returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemasDto> GetSchemasAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemasDto> GetSchemasAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Create a new schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The schema object that needs to be added to the app.</param>
         /// <returns>Schema created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PostSchemaAsync(string app, CreateSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PostSchemaAsync(CreateSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get a schema by name.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema to retrieve.</param>
         /// <returns>Schema found.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> GetSchemaAsync(string app, string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> GetSchemaAsync(string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutSchemaAsync(string app, string schema, UpdateSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutSchemaAsync(string schema, UpdateSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema to delete.</param>
         /// <returns>Schema deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteSchemaAsync(string app, string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteSchemaAsync(string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Synchronize a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutSchemaSyncAsync(string app, string schema, SynchronizeSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutSchemaSyncAsync(string schema, SynchronizeSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update a schema category.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutCategoryAsync(string app, string schema, ChangeCategoryDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutCategoryAsync(string schema, ChangeCategoryDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update the preview urls.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The preview urls for the schema.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutPreviewUrlsAsync(string app, string schema, System.Collections.Generic.IDictionary<string, string> request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutPreviewUrlsAsync(string schema, System.Collections.Generic.IDictionary<string, string> request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update the scripts.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema scripts object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutScriptsAsync(string app, string schema, SchemaScriptsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutScriptsAsync(string schema, SchemaScriptsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update the rules.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema rules object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PutRulesAsync(string app, string schema, ConfigureFieldRulesDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PutRulesAsync(string schema, ConfigureFieldRulesDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Publish a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema to publish.</param>
         /// <returns>Schema published.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> PublishSchemaAsync(string app, string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> PublishSchemaAsync(string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Unpublish a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema to unpublish.</param>
         /// <returns>Schema unpublished.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SchemaDto> UnpublishSchemaAsync(string app, string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SchemaDto> UnpublishSchemaAsync(string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class SchemasClient : ISchemasClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public SchemasClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public SchemasClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -4580,16 +4457,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Add a schema field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The field object that needs to be added to the schema.</param>
         /// <returns>Schema field created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PostFieldAsync(string app, string schema, AddFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PostFieldAsync(string schema, AddFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -4598,17 +4471,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -4697,7 +4567,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -4705,17 +4574,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Add a nested field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="request">The field object that needs to be added to the schema.</param>
         /// <returns>Schema field created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PostNestedFieldAsync(string app, string schema, long parentId, AddFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PostNestedFieldAsync(string schema, long parentId, AddFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -4727,18 +4592,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -4827,7 +4689,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -4835,16 +4696,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Configure UI fields.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The request that contains the field names.</param>
         /// <returns>Schema UI fields defined.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutSchemaUIFieldsAsync(string app, string schema, ConfigureUIFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutSchemaUIFieldsAsync(string schema, ConfigureUIFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -4853,17 +4710,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/ui");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -4942,7 +4796,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -4950,16 +4803,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Reorder all fields.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The request that contains the field ids.</param>
         /// <returns>Schema fields reordered.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutSchemaFieldOrderingAsync(string app, string schema, ReorderFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutSchemaFieldOrderingAsync(string schema, ReorderFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -4968,17 +4817,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/ordering");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -5057,7 +4903,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -5065,17 +4910,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Reorder all nested fields.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="request">The request that contains the field ids.</param>
         /// <returns>Schema fields reordered.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutNestedFieldOrderingAsync(string app, string schema, long parentId, ReorderFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutNestedFieldOrderingAsync(string schema, long parentId, ReorderFieldsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -5087,18 +4928,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested/ordering");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -5177,7 +5015,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -5185,17 +5022,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update a schema field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to update.</param>
         /// <param name="request">The field object that needs to be added to the schema.</param>
         /// <returns>Schema field updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutFieldAsync(string app, string schema, long id, UpdateFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutFieldAsync(string schema, long id, UpdateFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -5207,18 +5040,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -5297,7 +5127,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -5305,16 +5134,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete a schema field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to disable.</param>
         /// <returns>Schema field deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> DeleteFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> DeleteFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -5323,18 +5148,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -5409,7 +5231,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -5417,18 +5238,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update a nested field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to update.</param>
         /// <param name="request">The field object that needs to be added to the schema.</param>
         /// <returns>Schema field updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutNestedFieldAsync(string app, string schema, long parentId, long id, UpdateFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutNestedFieldAsync(string schema, long parentId, long id, UpdateFieldDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -5443,20 +5260,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -5535,7 +5348,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -5543,17 +5355,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete a nested field.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to disable.</param>
         /// <returns>Schema field deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> DeleteNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> DeleteNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -5565,19 +5373,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -5652,7 +5457,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -5663,16 +5467,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A locked field cannot be updated or deleted.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to lock.</param>
         /// <returns>Schema field shown.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> LockFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> LockFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -5681,18 +5481,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{id}/lock");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -5768,7 +5565,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -5779,17 +5575,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A locked field cannot be edited or deleted.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to lock.</param>
         /// <returns>Schema field hidden.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> LockNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> LockNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -5801,19 +5593,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested/{id}/lock");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -5889,7 +5678,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -5900,16 +5688,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A hidden field is not part of the API response, but can still be edited in the portal.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to hide.</param>
         /// <returns>Schema field hidden.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> HideFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> HideFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -5918,18 +5702,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{id}/hide");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -6005,7 +5786,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6016,17 +5796,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A hidden field is not part of the API response, but can still be edited in the portal.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to hide.</param>
         /// <returns>Schema field hidden.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> HideNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> HideNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -6038,19 +5814,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested/{id}/hide");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -6126,7 +5899,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6137,16 +5909,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A hidden field is not part of the API response, but can still be edited in the portal.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to show.</param>
         /// <returns>Schema field shown.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> ShowFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> ShowFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -6155,18 +5923,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{id}/show");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -6242,7 +6007,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6253,17 +6017,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A hidden field is not part of the API response, but can still be edited in the portal.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to show.</param>
         /// <returns>Schema field shown.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> ShowNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> ShowNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -6275,19 +6035,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested/{id}/show");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -6363,7 +6120,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6374,16 +6130,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to enable.</param>
         /// <returns>Schema field enabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> EnableFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> EnableFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -6392,18 +6144,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{id}/enable");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -6479,7 +6228,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6490,17 +6238,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to enable.</param>
         /// <returns>Schema field enabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> EnableNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> EnableNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -6512,19 +6256,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested/{id}/enable");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -6600,7 +6341,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6611,16 +6351,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="id">The ID of the field to disable.</param>
         /// <returns>Schema field disabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> DisableFieldAsync(string app, string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> DisableFieldAsync(string schema, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -6629,18 +6365,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{id}/disable");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -6716,7 +6449,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6727,17 +6459,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="parentId">The parent field id.</param>
         /// <param name="id">The ID of the field to disable.</param>
         /// <returns>Schema field disabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> DisableNestedFieldAsync(string app, string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> DisableNestedFieldAsync(string schema, long parentId, long id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -6749,19 +6477,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/fields/{parentId}/nested/{id}/disable");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{parentId}", System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -6837,7 +6562,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6845,26 +6569,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get schemas.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Schemas returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemasDto> GetSchemasAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemasDto> GetSchemasAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -6929,7 +6646,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -6937,30 +6653,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Create a new schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The schema object that needs to be added to the app.</param>
         /// <returns>Schema created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PostSchemaAsync(string app, CreateSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PostSchemaAsync(CreateSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -7043,7 +6752,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7051,31 +6759,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get a schema by name.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema to retrieve.</param>
         /// <returns>Schema found.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> GetSchemaAsync(string app, string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> GetSchemaAsync(string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -7140,7 +6841,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7148,16 +6848,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutSchemaAsync(string app, string schema, UpdateSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutSchemaAsync(string schema, UpdateSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -7166,17 +6862,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -7255,7 +6948,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7263,31 +6955,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema to delete.</param>
         /// <returns>Schema deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteSchemaAsync(string app, string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteSchemaAsync(string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -7356,7 +7041,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7364,16 +7048,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Synchronize a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutSchemaSyncAsync(string app, string schema, SynchronizeSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutSchemaSyncAsync(string schema, SynchronizeSchemaDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -7382,17 +7062,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/sync");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -7471,7 +7148,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7479,16 +7155,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update a schema category.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutCategoryAsync(string app, string schema, ChangeCategoryDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutCategoryAsync(string schema, ChangeCategoryDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -7497,17 +7169,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/category");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -7586,7 +7255,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7594,16 +7262,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update the preview urls.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The preview urls for the schema.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutPreviewUrlsAsync(string app, string schema, System.Collections.Generic.IDictionary<string, string> request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutPreviewUrlsAsync(string schema, System.Collections.Generic.IDictionary<string, string> request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -7612,17 +7276,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/preview-urls");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -7701,7 +7362,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7709,16 +7369,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update the scripts.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema scripts object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutScriptsAsync(string app, string schema, SchemaScriptsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutScriptsAsync(string schema, SchemaScriptsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -7727,17 +7383,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/scripts");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -7816,7 +7469,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7824,16 +7476,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update the rules.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema.</param>
         /// <param name="request">The schema rules object that needs to updated.</param>
         /// <returns>Schema updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PutRulesAsync(string app, string schema, ConfigureFieldRulesDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PutRulesAsync(string schema, ConfigureFieldRulesDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
@@ -7842,17 +7490,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/rules");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -7931,7 +7576,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -7939,31 +7583,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Publish a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema to publish.</param>
         /// <returns>Schema published.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> PublishSchemaAsync(string app, string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> PublishSchemaAsync(string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/publish");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -8039,7 +7676,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -8047,31 +7683,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Unpublish a schema.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="schema">The name of the schema to unpublish.</param>
         /// <returns>Schema unpublished.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SchemaDto> UnpublishSchemaAsync(string app, string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SchemaDto> UnpublishSchemaAsync(string schema, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (schema == null)
                 throw new System.ArgumentNullException("schema");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/schemas/{schema}/unpublish");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{schema}", System.Uri.EscapeDataString(ConvertToString(schema, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -8147,7 +7776,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -8164,8 +7792,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -8173,7 +7799,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -8270,162 +7896,146 @@ public partial interface IRulesClient
         /// <summary>
         /// Get rules.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Rules returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RulesDto> GetRulesAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RulesDto> GetRulesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Create a new rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The rule object that needs to be added to the app.</param>
         /// <returns>Rule created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RuleDto> PostRuleAsync(string app, CreateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RuleDto> PostRuleAsync(CreateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Cancel the current run.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Rule run cancelled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteRuleRunAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteRuleRunAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to update.</param>
         /// <param name="request">The rule object that needs to be added to the app.</param>
         /// <returns>Rule updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RuleDto> PutRuleAsync(string app, string id, UpdateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RuleDto> PutRuleAsync(string id, UpdateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to delete.</param>
         /// <returns>Rule deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteRuleAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteRuleAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Enable a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to enable.</param>
         /// <returns>Rule enabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RuleDto> EnableRuleAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RuleDto> EnableRuleAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Disable a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to disable.</param>
         /// <returns>Rule disabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RuleDto> DisableRuleAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RuleDto> DisableRuleAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Trigger a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to disable.</param>
         /// <returns>Rule triggered.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task TriggerRuleAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task TriggerRuleAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Run a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to run.</param>
         /// <param name="fromSnapshots">Runs the rule from snapeshots if possible.</param>
         /// <returns>Rule started.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task PutRuleRunAsync(string app, string id, bool? fromSnapshots = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task PutRuleRunAsync(string id, bool? fromSnapshots = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Cancels all rule events.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to cancel.</param>
         /// <returns>Rule events cancelled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteRuleEventsAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteRuleEventsAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Simulate a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The rule to simulate.</param>
         /// <returns>Rule simulated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SimulatedRuleEventsDto> SimulatePOSTAsync(string app, CreateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SimulatedRuleEventsDto> SimulatePOSTAsync(CreateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Simulate a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to simulate.</param>
         /// <returns>Rule simulated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<SimulatedRuleEventsDto> SimulateGETAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<SimulatedRuleEventsDto> SimulateGETAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get rule events.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="ruleId">The optional rule id to filter to events.</param>
         /// <param name="skip">The number of events to skip.</param>
         /// <param name="take">The number of events to take.</param>
         /// <returns>Rule events returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RuleEventsDto> GetEventsAsync(string app, string ruleId = null, int? skip = null, int? take = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RuleEventsDto> GetEventsAsync(string ruleId = null, int? skip = null, int? take = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Cancels all events.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Events cancelled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteEventsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteEventsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Retry the event immediately.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The event to enqueue.</param>
         /// <returns>Rule enqueued.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task PutEventAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task PutEventAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Cancels an event.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The event to enqueue.</param>
         /// <returns>Rule deqeued.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteEventAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteEventAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -8449,12 +8059,12 @@ public partial interface IRulesClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class RulesClient : IRulesClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public RulesClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public RulesClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -8483,13 +8093,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/rules/actions");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -8548,7 +8158,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -8556,26 +8165,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get rules.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Rules returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RulesDto> GetRulesAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RulesDto> GetRulesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -8640,7 +8242,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -8648,30 +8249,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Create a new rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The rule object that needs to be added to the app.</param>
         /// <returns>Rule created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RuleDto> PostRuleAsync(string app, CreateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RuleDto> PostRuleAsync(CreateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -8750,7 +8344,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -8758,26 +8351,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Cancel the current run.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Rule run cancelled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteRuleRunAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteRuleRunAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/run");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -8840,7 +8426,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -8848,16 +8433,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to update.</param>
         /// <param name="request">The rule object that needs to be added to the app.</param>
         /// <returns>Rule updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RuleDto> PutRuleAsync(string app, string id, UpdateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RuleDto> PutRuleAsync(string id, UpdateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
@@ -8866,17 +8447,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -8955,7 +8533,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -8963,31 +8540,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to delete.</param>
         /// <returns>Rule deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteRuleAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteRuleAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -9056,7 +8626,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9064,31 +8633,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Enable a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to enable.</param>
         /// <returns>Rule enabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RuleDto> EnableRuleAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RuleDto> EnableRuleAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/{id}/enable");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -9164,7 +8726,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9172,31 +8733,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Disable a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to disable.</param>
         /// <returns>Rule disabled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RuleDto> DisableRuleAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RuleDto> DisableRuleAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/{id}/disable");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -9272,7 +8826,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9280,31 +8833,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Trigger a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to disable.</param>
         /// <returns>Rule triggered.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task TriggerRuleAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task TriggerRuleAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/{id}/trigger");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
 
@@ -9374,7 +8920,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9382,22 +8927,18 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Run a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to run.</param>
         /// <param name="fromSnapshots">Runs the rule from snapeshots if possible.</param>
         /// <returns>Rule started.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task PutRuleRunAsync(string app, string id, bool? fromSnapshots = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task PutRuleRunAsync(string id, bool? fromSnapshots = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/{id}/run?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
             if (fromSnapshots != null)
             {
@@ -9405,14 +8946,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
 
@@ -9476,7 +9014,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9484,31 +9021,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Cancels all rule events.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to cancel.</param>
         /// <returns>Rule events cancelled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteRuleEventsAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteRuleEventsAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/{id}/events");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -9571,7 +9101,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9579,30 +9108,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Simulate a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The rule to simulate.</param>
         /// <returns>Rule simulated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SimulatedRuleEventsDto> SimulatePOSTAsync(string app, CreateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SimulatedRuleEventsDto> SimulatePOSTAsync(CreateRuleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/simulate");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -9681,7 +9203,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9689,31 +9210,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Simulate a rule.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the rule to simulate.</param>
         /// <returns>Rule simulated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<SimulatedRuleEventsDto> SimulateGETAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<SimulatedRuleEventsDto> SimulateGETAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/{id}/simulate");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -9778,7 +9292,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9786,20 +9299,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get rule events.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="ruleId">The optional rule id to filter to events.</param>
         /// <param name="skip">The number of events to skip.</param>
         /// <param name="take">The number of events to take.</param>
         /// <returns>Rule events returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RuleEventsDto> GetEventsAsync(string app, string ruleId = null, int? skip = null, int? take = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RuleEventsDto> GetEventsAsync(string ruleId = null, int? skip = null, int? take = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/events?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (ruleId != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("ruleId") + "=").Append(System.Uri.EscapeDataString(ConvertToString(ruleId, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
@@ -9814,14 +9323,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -9886,7 +9392,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9894,26 +9399,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Cancels all events.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Events cancelled.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteEventsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteEventsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/events");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -9976,7 +9474,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -9984,31 +9481,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Retry the event immediately.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The event to enqueue.</param>
         /// <returns>Rule enqueued.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task PutEventAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task PutEventAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/events/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
 
@@ -10078,7 +9568,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -10086,31 +9575,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Cancels an event.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The event to enqueue.</param>
         /// <returns>Rule deqeued.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteEventAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteEventAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/rules/events/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -10179,7 +9661,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -10193,13 +9674,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/rules/eventtypes");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -10258,7 +9739,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -10276,14 +9756,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/rules/eventtypes/{type}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{type}", System.Uri.EscapeDataString(ConvertToString(type, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -10348,7 +9828,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -10365,8 +9844,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -10374,7 +9851,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -10463,20 +9940,18 @@ public partial interface IPlansClient
         /// <summary>
         /// Get app plan information.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>App plan information returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<PlansDto> GetPlansAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<PlansDto> GetPlansAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Change the app plan.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">Plan object that needs to be changed.</param>
         /// <returns>Plan changed or redirect url returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<PlanChangedDto> PutPlanAsync(string app, ChangePlanDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<PlanChangedDto> PutPlanAsync(ChangePlanDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -10502,12 +9977,12 @@ public partial interface IPlansClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class PlansClient : IPlansClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public PlansClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public PlansClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -10530,26 +10005,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get app plan information.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>App plan information returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<PlansDto> GetPlansAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<PlansDto> GetPlansAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/plans");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -10614,7 +10082,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -10622,30 +10089,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Change the app plan.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">Plan object that needs to be changed.</param>
         /// <returns>Plan changed or redirect url returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<PlanChangedDto> PutPlanAsync(string app, ChangePlanDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<PlanChangedDto> PutPlanAsync(ChangePlanDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/plan");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -10724,7 +10184,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -10742,14 +10201,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/plans");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -10814,7 +10273,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -10836,14 +10294,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/plan");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -10922,7 +10380,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -10939,8 +10396,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -10948,7 +10403,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -11059,22 +10514,21 @@ public partial interface IPingClient
         /// <remarks>
         /// Can be used to test, if the Squidex API is alive and responding.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Service ping successful.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task GetAppPingAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task GetAppPingAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class PingClient : IPingClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public PingClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public PingClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -11103,13 +10557,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/info");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -11168,7 +10622,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -11185,13 +10638,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/ping");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -11244,7 +10697,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -11255,26 +10707,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// Can be used to test, if the Squidex API is alive and responding.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Service ping successful.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task GetAppPingAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task GetAppPingAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/ping/{app}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -11327,7 +10772,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -11344,8 +10788,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -11353,7 +10795,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -11452,12 +10894,12 @@ public partial interface INewsClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class NewsClient : INewsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public NewsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public NewsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -11487,18 +10929,18 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/news/features?");
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (version != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("version") + "=").Append(System.Uri.EscapeDataString(ConvertToString(version, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -11557,7 +10999,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -11574,8 +11015,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -11583,7 +11022,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -11684,12 +11123,12 @@ public partial interface ILanguagesClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class LanguagesClient : ILanguagesClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public LanguagesClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public LanguagesClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -11721,13 +11160,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/languages");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -11786,7 +11225,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -11803,8 +11241,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -11812,7 +11248,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -11901,11 +11337,10 @@ public partial interface IHistoryClient
         /// <summary>
         /// Get historical events.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="channel">The name of the channel.</param>
         /// <returns>Events returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<HistoryEventDto>> GetAppHistoryAsync(string app, string channel = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<HistoryEventDto>> GetAppHistoryAsync(string channel = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -11922,12 +11357,12 @@ public partial interface IHistoryClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class HistoryClient : IHistoryClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public HistoryClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public HistoryClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -11950,32 +11385,25 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get historical events.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="channel">The name of the channel.</param>
         /// <returns>Events returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<HistoryEventDto>> GetAppHistoryAsync(string app, string channel = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<HistoryEventDto>> GetAppHistoryAsync(string channel = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/history?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (channel != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("channel") + "=").Append(System.Uri.EscapeDataString(ConvertToString(channel, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -12040,7 +11468,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -12059,6 +11486,7 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/history?");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
             if (channel != null)
             {
@@ -12066,12 +11494,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -12136,7 +11563,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -12153,8 +11579,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -12162,7 +11586,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -12287,12 +11711,12 @@ public partial interface IEventConsumersClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class EventConsumersClient : IEventConsumersClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public EventConsumersClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public EventConsumersClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -12321,13 +11745,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/event-consumers");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -12386,7 +11810,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -12404,14 +11827,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/event-consumers/{consumerName}/start");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{consumerName}", System.Uri.EscapeDataString(ConvertToString(consumerName, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -12487,7 +11910,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -12505,14 +11927,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/event-consumers/{consumerName}/stop");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{consumerName}", System.Uri.EscapeDataString(ConvertToString(consumerName, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -12588,7 +12010,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -12606,14 +12027,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/event-consumers/{consumerName}/reset");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{consumerName}", System.Uri.EscapeDataString(ConvertToString(consumerName, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("PUT");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
@@ -12689,7 +12110,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -12706,8 +12126,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -12715,7 +12133,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -12821,12 +12239,12 @@ public partial interface IDiagnosticsClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class DiagnosticsClient : IDiagnosticsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public DiagnosticsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public DiagnosticsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -12855,13 +12273,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/diagnostics/dump");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -12924,7 +12342,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -12938,13 +12355,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/diagnostics/gcdump");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -13007,7 +12424,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -13024,8 +12440,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -13033,7 +12447,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -13122,11 +12536,10 @@ public partial interface ICommentsClient
         /// <summary>
         /// Get all watching users..
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="resource">The path to the resource.</param>
         /// <returns>Watching users returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<string>> GetWatchingUsersAsync(string app, string resource, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<string>> GetWatchingUsersAsync(string resource, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -13135,58 +12548,54 @@ public partial interface ICommentsClient
         /// <remarks>
         /// When passing in a version you can retrieve all updates since then.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="commentsId">The ID of the comments.</param>
         /// <param name="version">The current version.</param>
         /// <returns>Comments returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<CommentsDto> GetCommentsAsync(string app, string commentsId, long? version = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<CommentsDto> GetCommentsAsync(string commentsId, long? version = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Create a new comment.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="commentsId">The ID of the comments.</param>
         /// <param name="request">The comment object that needs to created.</param>
         /// <returns>Comment created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<CommentDto> PostCommentAsync(string app, string commentsId, UpsertCommentDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<CommentDto> PostCommentAsync(string commentsId, UpsertCommentDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update a comment.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="commentsId">The ID of the comments.</param>
         /// <param name="commentId">The ID of the comment.</param>
         /// <param name="request">The comment object that needs to updated.</param>
         /// <returns>Comment updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task PutCommentAsync(string app, string commentsId, string commentId, UpsertCommentDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task PutCommentAsync(string commentsId, string commentId, UpsertCommentDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete a comment.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="commentsId">The ID of the comments.</param>
         /// <param name="commentId">The ID of the comment.</param>
         /// <returns>Comment deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteCommentAsync(string app, string commentsId, string commentId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteCommentAsync(string commentsId, string commentId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class CommentsClient : ICommentsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public CommentsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public CommentsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -13209,28 +12618,21 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get all watching users..
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="resource">The path to the resource.</param>
         /// <returns>Watching users returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<string>> GetWatchingUsersAsync(string app, string resource, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<string>> GetWatchingUsersAsync(string resource, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/watching/{resource}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{resource}", System.Uri.EscapeDataString(ConvertToString(resource, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -13295,7 +12697,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -13306,22 +12707,18 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// When passing in a version you can retrieve all updates since then.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="commentsId">The ID of the comments.</param>
         /// <param name="version">The current version.</param>
         /// <returns>Comments returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<CommentsDto> GetCommentsAsync(string app, string commentsId, long? version = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<CommentsDto> GetCommentsAsync(string commentsId, long? version = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (commentsId == null)
                 throw new System.ArgumentNullException("commentsId");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/comments/{commentsId}?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{commentsId}", System.Uri.EscapeDataString(ConvertToString(commentsId, System.Globalization.CultureInfo.InvariantCulture)));
             if (version != null)
             {
@@ -13329,14 +12726,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -13401,7 +12795,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -13409,16 +12802,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Create a new comment.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="commentsId">The ID of the comments.</param>
         /// <param name="request">The comment object that needs to created.</param>
         /// <returns>Comment created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<CommentDto> PostCommentAsync(string app, string commentsId, UpsertCommentDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<CommentDto> PostCommentAsync(string commentsId, UpsertCommentDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (commentsId == null)
                 throw new System.ArgumentNullException("commentsId");
 
@@ -13427,17 +12816,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/comments/{commentsId}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{commentsId}", System.Uri.EscapeDataString(ConvertToString(commentsId, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -13516,7 +12902,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -13524,17 +12909,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update a comment.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="commentsId">The ID of the comments.</param>
         /// <param name="commentId">The ID of the comment.</param>
         /// <param name="request">The comment object that needs to updated.</param>
         /// <returns>Comment updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task PutCommentAsync(string app, string commentsId, string commentId, UpsertCommentDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task PutCommentAsync(string commentsId, string commentId, UpsertCommentDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (commentsId == null)
                 throw new System.ArgumentNullException("commentsId");
 
@@ -13546,18 +12927,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/comments/{commentsId}/{commentId}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{commentsId}", System.Uri.EscapeDataString(ConvertToString(commentsId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{commentId}", System.Uri.EscapeDataString(ConvertToString(commentId, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -13630,7 +13008,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -13638,16 +13015,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete a comment.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="commentsId">The ID of the comments.</param>
         /// <param name="commentId">The ID of the comment.</param>
         /// <returns>Comment deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteCommentAsync(string app, string commentsId, string commentId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteCommentAsync(string commentsId, string commentId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (commentsId == null)
                 throw new System.ArgumentNullException("commentsId");
 
@@ -13656,18 +13029,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/comments/{commentsId}/{commentId}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{commentsId}", System.Uri.EscapeDataString(ConvertToString(commentsId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{commentId}", System.Uri.EscapeDataString(ConvertToString(commentId, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -13736,7 +13106,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -13753,8 +13122,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -13762,7 +13129,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -13875,12 +13242,12 @@ public partial interface INotificationsClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class NotificationsClient : INotificationsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public NotificationsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public NotificationsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -13917,6 +13284,7 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/users/{userId}/notifications?");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{userId}", System.Uri.EscapeDataString(ConvertToString(userId, System.Globalization.CultureInfo.InvariantCulture)));
             if (version != null)
             {
@@ -13924,12 +13292,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -13988,7 +13355,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14010,15 +13376,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/users/{userId}/notifications/{commentId}");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{userId}", System.Uri.EscapeDataString(ConvertToString(userId, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{commentId}", System.Uri.EscapeDataString(ConvertToString(commentId, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -14087,7 +13453,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14104,8 +13469,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -14113,7 +13476,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -14202,21 +13565,19 @@ public partial interface IBackupsClient
         /// <summary>
         /// Get the backup content.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the backup.</param>
         /// <returns>Backup found and content returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<FileResponse> GetBackupContentAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<FileResponse> GetBackupContentAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete a backup.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the backup to delete.</param>
         /// <returns>Backup deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteBackupAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteBackupAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -14233,19 +13594,17 @@ public partial interface IBackupsClient
         /// <summary>
         /// Get all backup jobs.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Backups returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<BackupJobsDto> GetBackupsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<BackupJobsDto> GetBackupsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Start a new backup.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Backup started.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task PostBackupAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task PostBackupAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -14269,12 +13628,12 @@ public partial interface IBackupsClient
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class BackupsClient : IBackupsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public BackupsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public BackupsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -14297,31 +13656,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get the backup content.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the backup.</param>
         /// <returns>Backup found and content returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<FileResponse> GetBackupContentAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<FileResponse> GetBackupContentAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/backups/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/octet-stream"));
 
@@ -14384,7 +13736,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14392,31 +13743,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete a backup.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the backup to delete.</param>
         /// <returns>Backup deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteBackupAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteBackupAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/backups/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -14485,7 +13829,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14505,6 +13848,7 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/backups/{id}?");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
             if (appId != null)
             {
@@ -14516,14 +13860,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/octet-stream"));
 
@@ -14586,7 +13927,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14594,26 +13934,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get all backup jobs.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Backups returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<BackupJobsDto> GetBackupsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<BackupJobsDto> GetBackupsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/backups");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -14678,7 +14011,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14686,26 +14018,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Start a new backup.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Backup started.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task PostBackupAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task PostBackupAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/backups");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Content = new System.Net.Http.StringContent(string.Empty, System.Text.Encoding.UTF8, "application/json");
                     request_.Method = new System.Net.Http.HttpMethod("POST");
 
@@ -14775,7 +14100,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14789,13 +14113,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/restore");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -14854,7 +14178,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14872,13 +14195,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/restore");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -14945,7 +14268,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -14962,8 +14284,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -14971,7 +14291,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -15060,7 +14380,6 @@ public partial interface IAssetsClient
         /// <summary>
         /// Get the asset content.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="idOrSlug">The id or slug of the asset.</param>
         /// <param name="more">Optional suffix that can be used to seo-optimize the link to the image Has not effect.</param>
         /// <param name="version">The optional version of the asset.</param>
@@ -15079,7 +14398,7 @@ public partial interface IAssetsClient
         /// <param name="format">True to force a new resize even if it already stored.</param>
         /// <returns>Asset found and content or (resized) image returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<FileResponse> GetAssetContentBySlugAsync(string app, string idOrSlug, string more, long? version = null, long? cache = null, int? download = null, int? width = null, int? height = null, int? quality = null, ResizeMode? mode = null, string bg = null, float? focusX = null, float? focusY = null, bool? nofocus = null, bool? auto = null, bool? force = null, ImageFormat? format = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<FileResponse> GetAssetContentBySlugAsync(string idOrSlug, string more, long? version = null, long? cache = null, int? download = null, int? width = null, int? height = null, int? quality = null, ResizeMode? mode = null, string bg = null, float? focusX = null, float? focusY = null, bool? nofocus = null, bool? auto = null, bool? force = null, ImageFormat? format = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -15112,54 +14431,49 @@ public partial interface IAssetsClient
         /// <remarks>
         /// Get all asset folders for the app.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="parentId">The optional parent folder id.</param>
         /// <param name="scope">The scope of the query.</param>
         /// <returns>Asset folders returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetFoldersDto> GetAssetFoldersAsync(string app, string parentId = null, AssetFolderScope? scope = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetFoldersDto> GetAssetFoldersAsync(string parentId = null, AssetFolderScope? scope = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Create an asset folder.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The asset folder object that needs to be added to the App.</param>
         /// <returns>Asset folder created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetFolderDto> PostAssetFolderAsync(string app, CreateAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetFolderDto> PostAssetFolderAsync(CreateAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update an asset folder.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset folder.</param>
         /// <param name="request">The asset folder object that needs to updated.</param>
         /// <returns>Asset folder updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetFolderDto> PutAssetFolderAsync(string app, string id, RenameAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetFolderDto> PutAssetFolderAsync(string id, RenameAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete an asset folder.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset folder to delete.</param>
         /// <returns>Asset folder deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteAssetFolderAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteAssetFolderAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Move an asset folder.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset folder.</param>
         /// <param name="request">The asset folder object that needs to updated.</param>
         /// <returns>Asset folder moved.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetFolderDto> PutAssetFolderParentAsync(string app, string id, MoveAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetFolderDto> PutAssetFolderParentAsync(string id, MoveAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -15168,21 +14482,19 @@ public partial interface IAssetsClient
         /// <remarks>
         /// Get all tags for assets.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Assets tags returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string, int>> GetTagsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string, int>> GetTagsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Rename an asset tag.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="name">The tag to return.</param>
         /// <param name="request">The required request object.</param>
         /// <returns>Asset tag renamed and new tags returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string, int>> PutTagAsync(string app, string name, RenameTagDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string, int>> PutTagAsync(string name, RenameTagDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -15191,7 +14503,6 @@ public partial interface IAssetsClient
         /// <remarks>
         /// Get all assets for the app.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="top">Optional number of items to take.</param>
         /// <param name="skip">Optional number of items to skip.</param>
         /// <param name="orderby">Optional OData order definition.</param>
@@ -15201,7 +14512,7 @@ public partial interface IAssetsClient
         /// <param name="q">The optional json query.</param>
         /// <returns>Assets returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetsDto> GetAssetsAsync(string app, double? top = null, double? skip = null, string orderby = null, string filter = null, string parentId = null, string ids = null, string q = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetsDto> GetAssetsAsync(double? top = null, double? skip = null, string orderby = null, string filter = null, string parentId = null, string ids = null, string q = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -15210,13 +14521,12 @@ public partial interface IAssetsClient
         /// <remarks>
         /// You can only upload one file at a time. The mime type of the file is not calculated by Squidex and is required correctly.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="parentId">The optional parent folder id.</param>
         /// <param name="id">The optional custom asset id.</param>
         /// <param name="duplicate">True to duplicate the asset, event if the file has been uploaded.</param>
         /// <returns>Asset created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetDto> PostAssetAsync(string app, string parentId = null, string id = null, bool? duplicate = null, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetDto> PostAssetAsync(string parentId = null, string id = null, bool? duplicate = null, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -15225,21 +14535,19 @@ public partial interface IAssetsClient
         /// <remarks>
         /// Get all assets for the app.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="query">The required query object.</param>
         /// <returns>Assets returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetsDto> GetAssetsPostAsync(string app, QueryDto query, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetsDto> GetAssetsPostAsync(QueryDto query, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get an asset by id.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset to retrieve.</param>
         /// <returns>Asset found.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetDto> GetAssetAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetDto> GetAssetAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -15248,46 +14556,42 @@ public partial interface IAssetsClient
         /// <remarks>
         /// You can only upload one file at a time. The mime type of the file is not calculated by Squidex and is required correctly.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The optional custom asset id.</param>
         /// <param name="parentId">The optional parent folder id.</param>
         /// <param name="duplicate">True to duplicate the asset, event if the file has been uploaded.</param>
         /// <returns>Asset created or updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetDto> PostUpsertAssetAsync(string app, string id, string parentId = null, bool? duplicate = null, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetDto> PostUpsertAssetAsync(string id, string parentId = null, bool? duplicate = null, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update an asset.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset.</param>
         /// <param name="request">The asset object that needs to updated.</param>
         /// <returns>Asset updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetDto> PutAssetAsync(string app, string id, AnnotateAssetDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetDto> PutAssetAsync(string id, AnnotateAssetDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete an asset.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset to delete.</param>
         /// <param name="checkReferrers">True to check referrers of this asset.</param>
         /// <param name="permanent">True to delete the asset permanently.</param>
         /// <returns>Asset deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteAssetAsync(string app, string id, bool? checkReferrers = null, bool? permanent = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteAssetAsync(string id, bool? checkReferrers = null, bool? permanent = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Bulk update assets.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The bulk update request.</param>
         /// <returns>Assets created, update or delete.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<BulkResultDto>> BulkUpdateAssetsAsync(string app, BulkUpdateAssetsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<BulkResultDto>> BulkUpdateAssetsAsync(BulkUpdateAssetsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -15296,34 +14600,32 @@ public partial interface IAssetsClient
         /// <remarks>
         /// Use multipart request to upload an asset.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset.</param>
         /// <returns>Asset updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetDto> PutAssetContentAsync(string app, string id, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetDto> PutAssetContentAsync(string id, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Moves the asset.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset.</param>
         /// <param name="request">The asset object that needs to updated.</param>
         /// <returns>Asset moved.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetDto> PutAssetParentAsync(string app, string id, MoveAssetDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetDto> PutAssetParentAsync(string id, MoveAssetDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class AssetsClient : IAssetsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public AssetsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public AssetsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -15346,7 +14648,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get the asset content.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="idOrSlug">The id or slug of the asset.</param>
         /// <param name="more">Optional suffix that can be used to seo-optimize the link to the image Has not effect.</param>
         /// <param name="version">The optional version of the asset.</param>
@@ -15365,17 +14666,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <param name="format">True to force a new resize even if it already stored.</param>
         /// <returns>Asset found and content or (resized) image returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<FileResponse> GetAssetContentBySlugAsync(string app, string idOrSlug, string more, long? version = null, long? cache = null, int? download = null, int? width = null, int? height = null, int? quality = null, ResizeMode? mode = null, string bg = null, float? focusX = null, float? focusY = null, bool? nofocus = null, bool? auto = null, bool? force = null, ImageFormat? format = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<FileResponse> GetAssetContentBySlugAsync(string idOrSlug, string more, long? version = null, long? cache = null, int? download = null, int? width = null, int? height = null, int? quality = null, ResizeMode? mode = null, string bg = null, float? focusX = null, float? focusY = null, bool? nofocus = null, bool? auto = null, bool? force = null, ImageFormat? format = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (idOrSlug == null)
                 throw new System.ArgumentNullException("idOrSlug");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/assets/{app}/{idOrSlug}/{more}?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{idOrSlug}", System.Uri.EscapeDataString(ConvertToString(idOrSlug, System.Globalization.CultureInfo.InvariantCulture)));
             urlBuilder_.Replace("{more}", System.Uri.EscapeDataString(ConvertToString(more, System.Globalization.CultureInfo.InvariantCulture)));
             if (version != null)
@@ -15436,19 +14734,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
-
-
-
-
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/octet-stream"));
 
@@ -15511,7 +14801,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -15544,6 +14833,7 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/assets/{id}?");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
             if (version != null)
             {
@@ -15603,16 +14893,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-
-
-
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/octet-stream"));
 
@@ -15675,7 +14960,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -15686,19 +14970,15 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// Get all asset folders for the app.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="parentId">The optional parent folder id.</param>
         /// <param name="scope">The scope of the query.</param>
         /// <returns>Asset folders returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetFoldersDto> GetAssetFoldersAsync(string app, string parentId = null, AssetFolderScope? scope = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetFoldersDto> GetAssetFoldersAsync(string parentId = null, AssetFolderScope? scope = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/folders?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (parentId != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("parentId") + "=").Append(System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
@@ -15709,14 +14989,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -15781,7 +15058,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -15789,30 +15065,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Create an asset folder.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The asset folder object that needs to be added to the App.</param>
         /// <returns>Asset folder created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetFolderDto> PostAssetFolderAsync(string app, CreateAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetFolderDto> PostAssetFolderAsync(CreateAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/folders");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -15891,7 +15160,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -15899,16 +15167,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update an asset folder.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset folder.</param>
         /// <param name="request">The asset folder object that needs to updated.</param>
         /// <returns>Asset folder updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetFolderDto> PutAssetFolderAsync(string app, string id, RenameAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetFolderDto> PutAssetFolderAsync(string id, RenameAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
@@ -15917,17 +15181,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/folders/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -16006,7 +15267,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16014,31 +15274,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete an asset folder.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset folder to delete.</param>
         /// <returns>Asset folder deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteAssetFolderAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteAssetFolderAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/folders/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -16107,7 +15360,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16115,16 +15367,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Move an asset folder.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset folder.</param>
         /// <param name="request">The asset folder object that needs to updated.</param>
         /// <returns>Asset folder moved.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetFolderDto> PutAssetFolderParentAsync(string app, string id, MoveAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetFolderDto> PutAssetFolderParentAsync(string id, MoveAssetFolderDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
@@ -16133,17 +15381,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/folders/{id}/parent");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -16222,7 +15467,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16233,26 +15477,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// Get all tags for assets.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Assets tags returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string, int>> GetTagsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string, int>> GetTagsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/tags");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -16317,7 +15554,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16325,16 +15561,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Rename an asset tag.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="name">The tag to return.</param>
         /// <param name="request">The required request object.</param>
         /// <returns>Asset tag renamed and new tags returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string, int>> PutTagAsync(string app, string name, RenameTagDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.IDictionary<string, int>> PutTagAsync(string name, RenameTagDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (name == null)
                 throw new System.ArgumentNullException("name");
 
@@ -16343,17 +15575,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/tags/{name}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{name}", System.Uri.EscapeDataString(ConvertToString(name, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -16432,7 +15661,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16443,7 +15671,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// Get all assets for the app.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="top">Optional number of items to take.</param>
         /// <param name="skip">Optional number of items to skip.</param>
         /// <param name="orderby">Optional OData order definition.</param>
@@ -16453,14 +15680,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <param name="q">The optional json query.</param>
         /// <returns>Assets returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetsDto> GetAssetsAsync(string app, double? top = null, double? skip = null, string orderby = null, string filter = null, string parentId = null, string ids = null, string q = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetsDto> GetAssetsAsync(double? top = null, double? skip = null, string orderby = null, string filter = null, string parentId = null, string ids = null, string q = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (top != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("$top") + "=").Append(System.Uri.EscapeDataString(ConvertToString(top, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
@@ -16491,16 +15715,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
-
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -16565,7 +15784,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16576,20 +15794,16 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// You can only upload one file at a time. The mime type of the file is not calculated by Squidex and is required correctly.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="parentId">The optional parent folder id.</param>
         /// <param name="id">The optional custom asset id.</param>
         /// <param name="duplicate">True to duplicate the asset, event if the file has been uploaded.</param>
         /// <returns>Asset created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetDto> PostAssetAsync(string app, string parentId = null, string id = null, bool? duplicate = null, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetDto> PostAssetAsync(string parentId = null, string id = null, bool? duplicate = null, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             if (parentId != null)
             {
                 urlBuilder_.Append(System.Uri.EscapeDataString("ParentId") + "=").Append(System.Uri.EscapeDataString(ConvertToString(parentId, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
@@ -16604,15 +15818,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
-
                     var boundary_ = System.Guid.NewGuid().ToString();
                     var content_ = new System.Net.Http.MultipartFormDataContent(boundary_);
                     content_.Headers.Remove("Content-Type");
@@ -16712,7 +15922,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16723,30 +15932,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// Get all assets for the app.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="query">The required query object.</param>
         /// <returns>Assets returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetsDto> GetAssetsPostAsync(string app, QueryDto query, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetsDto> GetAssetsPostAsync(QueryDto query, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (query == null)
                 throw new System.ArgumentNullException("query");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/query");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(query, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -16825,7 +16027,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16833,31 +16034,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get an asset by id.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset to retrieve.</param>
         /// <returns>Asset found.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetDto> GetAssetAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetDto> GetAssetAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -16922,7 +16116,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -16933,23 +16126,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// You can only upload one file at a time. The mime type of the file is not calculated by Squidex and is required correctly.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The optional custom asset id.</param>
         /// <param name="parentId">The optional parent folder id.</param>
         /// <param name="duplicate">True to duplicate the asset, event if the file has been uploaded.</param>
         /// <returns>Asset created or updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetDto> PostUpsertAssetAsync(string app, string id, string parentId = null, bool? duplicate = null, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetDto> PostUpsertAssetAsync(string id, string parentId = null, bool? duplicate = null, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/{id}?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
             if (parentId != null)
             {
@@ -16961,15 +16150,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
-
                     var boundary_ = System.Guid.NewGuid().ToString();
                     var content_ = new System.Net.Http.MultipartFormDataContent(boundary_);
                     content_.Headers.Remove("Content-Type");
@@ -17069,7 +16254,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -17077,16 +16261,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update an asset.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset.</param>
         /// <param name="request">The asset object that needs to updated.</param>
         /// <returns>Asset updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetDto> PutAssetAsync(string app, string id, AnnotateAssetDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetDto> PutAssetAsync(string id, AnnotateAssetDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
@@ -17095,17 +16275,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -17184,7 +16361,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -17192,23 +16368,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete an asset.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset to delete.</param>
         /// <param name="checkReferrers">True to check referrers of this asset.</param>
         /// <param name="permanent">True to delete the asset permanently.</param>
         /// <returns>Asset deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteAssetAsync(string app, string id, bool? checkReferrers = null, bool? permanent = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteAssetAsync(string id, bool? checkReferrers = null, bool? permanent = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/{id}?");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
             if (checkReferrers != null)
             {
@@ -17220,14 +16392,11 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             urlBuilder_.Length--;
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -17296,7 +16465,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -17304,30 +16472,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Bulk update assets.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The bulk update request.</param>
         /// <returns>Assets created, update or delete.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<BulkResultDto>> BulkUpdateAssetsAsync(string app, BulkUpdateAssetsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<BulkResultDto>> BulkUpdateAssetsAsync(BulkUpdateAssetsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/bulk");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -17406,7 +16567,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -17417,31 +16577,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// Use multipart request to upload an asset.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset.</param>
         /// <returns>Asset updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetDto> PutAssetContentAsync(string app, string id, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetDto> PutAssetContentAsync(string id, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/{id}/content");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var boundary_ = System.Guid.NewGuid().ToString();
                     var content_ = new System.Net.Http.MultipartFormDataContent(boundary_);
                     content_.Headers.Remove("Content-Type");
@@ -17541,7 +16694,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -17549,16 +16701,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Moves the asset.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the asset.</param>
         /// <param name="request">The asset object that needs to updated.</param>
         /// <returns>Asset moved.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetDto> PutAssetParentAsync(string app, string id, MoveAssetDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetDto> PutAssetParentAsync(string id, MoveAssetDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
@@ -17567,17 +16715,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/{id}/parent");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -17656,7 +16801,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -17673,8 +16817,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -17682,7 +16824,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
@@ -17771,20 +16913,18 @@ public partial interface IAppsClient
         /// <summary>
         /// Get the app asset scripts.
         /// </summary>
-        /// <param name="app">The name of the app to get the asset scripts for.</param>
         /// <returns>Asset scripts returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetScriptsDto> GetAssetScriptsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetScriptsDto> GetAssetScriptsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update the app asset scripts.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <param name="request">The values to update.</param>
         /// <returns>Asset scripts updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AssetScriptsDto> PutAssetScriptsAsync(string app, UpdateAssetScriptsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AssetScriptsDto> PutAssetScriptsAsync(UpdateAssetScriptsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -17793,10 +16933,9 @@ public partial interface IAppsClient
         /// <remarks>
         /// Gets all configured clients for the app with the specified name.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Clients returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<ClientsDto> GetClientsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ClientsDto> GetClientsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -17806,11 +16945,10 @@ public partial interface IAppsClient
         /// Create a new client for the app with the specified name.
         /// <br/>The client secret is auto generated on the server and returned. The client does not expire, the access token is valid for 30 days.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">Client object that needs to be added to the app.</param>
         /// <returns>Client created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<ClientsDto> PostClientAsync(string app, CreateClientDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ClientsDto> PostClientAsync(CreateClientDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -17819,12 +16957,11 @@ public partial interface IAppsClient
         /// <remarks>
         /// Only the display name can be changed, create a new client if necessary.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the client that must be updated.</param>
         /// <param name="request">Client object that needs to be updated.</param>
         /// <returns>Client updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<ClientsDto> PutClientAsync(string app, string id, UpdateClientDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ClientsDto> PutClientAsync(string id, UpdateClientDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -17833,165 +16970,148 @@ public partial interface IAppsClient
         /// <remarks>
         /// The application that uses this client credentials cannot access the API after it has been revoked.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the client that must be deleted.</param>
         /// <returns>Client deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<ClientsDto> DeleteClientAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ClientsDto> DeleteClientAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get app contributors.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Contributors returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<ContributorsDto> GetContributorsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ContributorsDto> GetContributorsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Assign contributor to app.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">Contributor object that needs to be added to the app.</param>
         /// <returns>Contributor assigned to app.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<ContributorsDto> PostContributorAsync(string app, AssignContributorDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ContributorsDto> PostContributorAsync(AssignContributorDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Remove yourself.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Contributor removed.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<ContributorsDto> DeleteMyselfAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ContributorsDto> DeleteMyselfAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Remove contributor.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the contributor.</param>
         /// <returns>Contributor removed.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<ContributorsDto> DeleteContributorAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ContributorsDto> DeleteContributorAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get the app image.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>App image found and content or (resized) image returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<FileResponse> GetImageAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<FileResponse> GetImageAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Upload the app image.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <returns>App image uploaded.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppDto> UploadImageAsync(string app, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppDto> UploadImageAsync(FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Remove the app image.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <returns>App image removed.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppDto> DeleteImageAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppDto> DeleteImageAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get app languages.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Languages returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppLanguagesDto> GetLanguagesAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppLanguagesDto> GetLanguagesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Attaches an app language.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The language to add to the app.</param>
         /// <returns>Language created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppLanguagesDto> PostLanguageAsync(string app, AddLanguageDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppLanguagesDto> PostLanguageAsync(AddLanguageDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Updates an app language.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="language">The language to update.</param>
         /// <param name="request">The language object.</param>
         /// <returns>Language updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppLanguagesDto> PutLanguageAsync(string app, string language, UpdateLanguageDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppLanguagesDto> PutLanguageAsync(string language, UpdateLanguageDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Deletes an app language.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="language">The language to delete from the app.</param>
         /// <returns>Language deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppLanguagesDto> DeleteLanguageAsync(string app, string language, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppLanguagesDto> DeleteLanguageAsync(string language, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get app roles.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Roles returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RolesDto> GetRolesAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RolesDto> GetRolesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Add role to app.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">Role object that needs to be added to the app.</param>
         /// <returns>Role created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RolesDto> PostRoleAsync(string app, AddRoleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RolesDto> PostRoleAsync(AddRoleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get app permissions.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>App permissions returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<string>> GetPermissionsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<System.Collections.Generic.ICollection<string>> GetPermissionsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update an app role.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="roleName">The name of the role to be updated.</param>
         /// <param name="request">Role to be updated for the app.</param>
         /// <returns>Role updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RolesDto> PutRoleAsync(string app, string roleName, UpdateRoleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RolesDto> PutRoleAsync(string roleName, UpdateRoleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Remove role from app.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="roleName">The name of the role.</param>
         /// <returns>Role deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<RolesDto> DeleteRoleAsync(string app, string roleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<RolesDto> DeleteRoleAsync(string roleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
@@ -18035,110 +17155,100 @@ public partial interface IAppsClient
         /// <summary>
         /// Get an app by name.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Apps returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppDto> GetAppAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppDto> GetAppAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update the app.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <param name="request">The values to update.</param>
         /// <returns>App updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppDto> PutAppAsync(string app, UpdateAppDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppDto> PutAppAsync(UpdateAppDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete the app.
         /// </summary>
-        /// <param name="app">The name of the app to delete.</param>
         /// <returns>App deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task DeleteAppAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task DeleteAppAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Transfer the app.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <param name="request">The team information.</param>
         /// <returns>App transferred.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppDto> PutAppTeamAsync(string app, TransferToTeamDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppDto> PutAppTeamAsync(TransferToTeamDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get the app settings.
         /// </summary>
-        /// <param name="app">The name of the app to get the settings for.</param>
         /// <returns>App settings returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppSettingsDto> GetSettingsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppSettingsDto> GetSettingsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update the app settings.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <param name="request">The values to update.</param>
         /// <returns>App updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<AppSettingsDto> PutSettingsAsync(string app, UpdateAppSettingsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<AppSettingsDto> PutSettingsAsync(UpdateAppSettingsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Get app workflow.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Workflows returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<WorkflowsDto> GetWorkflowsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<WorkflowsDto> GetWorkflowsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Create a workflow.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The new workflow.</param>
         /// <returns>Workflow created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<WorkflowsDto> PostWorkflowAsync(string app, AddWorkflowDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<WorkflowsDto> PostWorkflowAsync(AddWorkflowDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Update a workflow.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the workflow to update.</param>
         /// <param name="request">The new workflow.</param>
         /// <returns>Workflow updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<WorkflowsDto> PutWorkflowAsync(string app, string id, UpdateWorkflowDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<WorkflowsDto> PutWorkflowAsync(string id, UpdateWorkflowDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <summary>
         /// Delete a workflow.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the workflow to update.</param>
         /// <returns>Workflow deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<WorkflowsDto> DeleteWorkflowAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<WorkflowsDto> DeleteWorkflowAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.17.0.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v9.0.0.0))")]
     public partial class AppsClient : IAppsClient
     {
-        private Squidex.ClientLibrary.Configuration.IHttpClientProvider _httpClientProvider;
+        private Squidex.ClientLibrary.SquidexOptions _options;
         private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
 
-        public AppsClient(Squidex.ClientLibrary.Configuration.IHttpClientProvider httpClientProvider)
+        public AppsClient(Squidex.ClientLibrary.SquidexOptions options)
         {
-            _httpClientProvider = httpClientProvider;
+            _options = options;
             _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
         }
 
@@ -18161,26 +17271,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get the app asset scripts.
         /// </summary>
-        /// <param name="app">The name of the app to get the asset scripts for.</param>
         /// <returns>Asset scripts returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetScriptsDto> GetAssetScriptsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetScriptsDto> GetAssetScriptsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/scripts");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -18245,7 +17348,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -18253,30 +17355,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update the app asset scripts.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <param name="request">The values to update.</param>
         /// <returns>Asset scripts updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AssetScriptsDto> PutAssetScriptsAsync(string app, UpdateAssetScriptsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AssetScriptsDto> PutAssetScriptsAsync(UpdateAssetScriptsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/assets/scripts");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -18355,7 +17450,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -18366,26 +17460,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// Gets all configured clients for the app with the specified name.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Clients returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ClientsDto> GetClientsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<ClientsDto> GetClientsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/clients");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -18450,7 +17537,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -18462,30 +17548,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// Create a new client for the app with the specified name.
         /// <br/>The client secret is auto generated on the server and returned. The client does not expire, the access token is valid for 30 days.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">Client object that needs to be added to the app.</param>
         /// <returns>Client created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ClientsDto> PostClientAsync(string app, CreateClientDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<ClientsDto> PostClientAsync(CreateClientDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/clients");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -18564,7 +17643,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -18575,16 +17653,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// Only the display name can be changed, create a new client if necessary.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the client that must be updated.</param>
         /// <param name="request">Client object that needs to be updated.</param>
         /// <returns>Client updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ClientsDto> PutClientAsync(string app, string id, UpdateClientDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<ClientsDto> PutClientAsync(string id, UpdateClientDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
@@ -18593,17 +17667,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/clients/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -18682,7 +17753,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -18693,31 +17763,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <remarks>
         /// The application that uses this client credentials cannot access the API after it has been revoked.
         /// </remarks>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the client that must be deleted.</param>
         /// <returns>Client deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ClientsDto> DeleteClientAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<ClientsDto> DeleteClientAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/clients/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -18792,7 +17855,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -18800,26 +17862,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get app contributors.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Contributors returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ContributorsDto> GetContributorsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<ContributorsDto> GetContributorsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/contributors");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -18884,7 +17939,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -18892,30 +17946,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Assign contributor to app.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">Contributor object that needs to be added to the app.</param>
         /// <returns>Contributor assigned to app.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ContributorsDto> PostContributorAsync(string app, AssignContributorDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<ContributorsDto> PostContributorAsync(AssignContributorDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/contributors");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -18994,7 +18041,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19002,26 +18048,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Remove yourself.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Contributor removed.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ContributorsDto> DeleteMyselfAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<ContributorsDto> DeleteMyselfAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/contributors/me");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -19096,7 +18135,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19104,31 +18142,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Remove contributor.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the contributor.</param>
         /// <returns>Contributor removed.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ContributorsDto> DeleteContributorAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<ContributorsDto> DeleteContributorAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/contributors/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -19203,7 +18234,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19211,26 +18241,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get the app image.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>App image found and content or (resized) image returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<FileResponse> GetImageAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<FileResponse> GetImageAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/image");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/octet-stream"));
 
@@ -19293,7 +18316,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19301,26 +18323,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Upload the app image.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <returns>App image uploaded.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppDto> UploadImageAsync(string app, FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppDto> UploadImageAsync(FileParameter file = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/image");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var boundary_ = System.Guid.NewGuid().ToString();
                     var content_ = new System.Net.Http.MultipartFormDataContent(boundary_);
                     content_.Headers.Remove("Content-Type");
@@ -19410,7 +18425,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19418,26 +18432,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Remove the app image.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <returns>App image removed.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppDto> DeleteImageAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppDto> DeleteImageAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/image");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -19512,7 +18519,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19520,26 +18526,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get app languages.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Languages returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppLanguagesDto> GetLanguagesAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppLanguagesDto> GetLanguagesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/languages");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -19604,7 +18603,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19612,30 +18610,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Attaches an app language.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The language to add to the app.</param>
         /// <returns>Language created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppLanguagesDto> PostLanguageAsync(string app, AddLanguageDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppLanguagesDto> PostLanguageAsync(AddLanguageDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/languages");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -19714,7 +18705,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19722,16 +18712,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Updates an app language.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="language">The language to update.</param>
         /// <param name="request">The language object.</param>
         /// <returns>Language updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppLanguagesDto> PutLanguageAsync(string app, string language, UpdateLanguageDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppLanguagesDto> PutLanguageAsync(string language, UpdateLanguageDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (language == null)
                 throw new System.ArgumentNullException("language");
 
@@ -19740,17 +18726,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/languages/{language}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{language}", System.Uri.EscapeDataString(ConvertToString(language, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -19829,7 +18812,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19837,31 +18819,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Deletes an app language.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="language">The language to delete from the app.</param>
         /// <returns>Language deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppLanguagesDto> DeleteLanguageAsync(string app, string language, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppLanguagesDto> DeleteLanguageAsync(string language, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (language == null)
                 throw new System.ArgumentNullException("language");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/languages/{language}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{language}", System.Uri.EscapeDataString(ConvertToString(language, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -19936,7 +18911,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -19944,26 +18918,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get app roles.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Roles returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RolesDto> GetRolesAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RolesDto> GetRolesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/roles");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -20028,7 +18995,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20036,30 +19002,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Add role to app.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">Role object that needs to be added to the app.</param>
         /// <returns>Role created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RolesDto> PostRoleAsync(string app, AddRoleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RolesDto> PostRoleAsync(AddRoleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/roles");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -20138,7 +19097,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20146,26 +19104,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get app permissions.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>App permissions returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<string>> GetPermissionsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<System.Collections.Generic.ICollection<string>> GetPermissionsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/roles/permissions");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -20230,7 +19181,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20238,16 +19188,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update an app role.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="roleName">The name of the role to be updated.</param>
         /// <param name="request">Role to be updated for the app.</param>
         /// <returns>Role updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RolesDto> PutRoleAsync(string app, string roleName, UpdateRoleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RolesDto> PutRoleAsync(string roleName, UpdateRoleDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (roleName == null)
                 throw new System.ArgumentNullException("roleName");
 
@@ -20256,17 +19202,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/roles/{roleName}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{roleName}", System.Uri.EscapeDataString(ConvertToString(roleName, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -20345,7 +19288,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20353,31 +19295,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Remove role from app.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="roleName">The name of the role.</param>
         /// <returns>Role deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<RolesDto> DeleteRoleAsync(string app, string roleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<RolesDto> DeleteRoleAsync(string roleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (roleName == null)
                 throw new System.ArgumentNullException("roleName");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/roles/{roleName}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{roleName}", System.Uri.EscapeDataString(ConvertToString(roleName, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -20452,7 +19387,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20470,13 +19404,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -20535,7 +19469,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20557,13 +19490,13 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps");
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -20646,7 +19579,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20668,14 +19600,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/teams/{team}/apps");
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{team}", System.Uri.EscapeDataString(ConvertToString(team, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -20734,7 +19666,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20742,26 +19673,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get an app by name.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Apps returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppDto> GetAppAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppDto> GetAppAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -20826,7 +19750,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20834,30 +19757,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update the app.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <param name="request">The values to update.</param>
         /// <returns>App updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppDto> PutAppAsync(string app, UpdateAppDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppDto> PutAppAsync(UpdateAppDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -20936,7 +19852,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -20944,26 +19859,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete the app.
         /// </summary>
-        /// <param name="app">The name of the app to delete.</param>
         /// <returns>App deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task DeleteAppAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task DeleteAppAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
 
                     PrepareRequest(client_, request_, urlBuilder_);
@@ -21032,7 +19940,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -21040,30 +19947,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Transfer the app.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <param name="request">The team information.</param>
         /// <returns>App transferred.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppDto> PutAppTeamAsync(string app, TransferToTeamDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppDto> PutAppTeamAsync(TransferToTeamDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/team");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -21142,7 +20042,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -21150,26 +20049,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get the app settings.
         /// </summary>
-        /// <param name="app">The name of the app to get the settings for.</param>
         /// <returns>App settings returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppSettingsDto> GetSettingsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppSettingsDto> GetSettingsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/settings");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -21234,7 +20126,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -21242,30 +20133,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update the app settings.
         /// </summary>
-        /// <param name="app">The name of the app to update.</param>
         /// <param name="request">The values to update.</param>
         /// <returns>App updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<AppSettingsDto> PutSettingsAsync(string app, UpdateAppSettingsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<AppSettingsDto> PutSettingsAsync(UpdateAppSettingsDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/settings");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -21344,7 +20228,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -21352,26 +20235,19 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Get app workflow.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <returns>Workflows returned.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<WorkflowsDto> GetWorkflowsAsync(string app, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<WorkflowsDto> GetWorkflowsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/workflows");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("GET");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -21436,7 +20312,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -21444,30 +20319,23 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Create a workflow.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="request">The new workflow.</param>
         /// <returns>Workflow created.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<WorkflowsDto> PostWorkflowAsync(string app, AddWorkflowDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<WorkflowsDto> PostWorkflowAsync(AddWorkflowDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (request == null)
                 throw new System.ArgumentNullException("request");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/workflows");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -21546,7 +20414,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -21554,16 +20421,12 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Update a workflow.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the workflow to update.</param>
         /// <param name="request">The new workflow.</param>
         /// <returns>Workflow updated.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<WorkflowsDto> PutWorkflowAsync(string app, string id, UpdateWorkflowDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<WorkflowsDto> PutWorkflowAsync(string id, UpdateWorkflowDto request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
@@ -21572,17 +20435,14 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/workflows/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     var json_ = Newtonsoft.Json.JsonConvert.SerializeObject(request, _settings.Value);
                     var content_ = new System.Net.Http.StringContent(json_);
                     content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
@@ -21661,7 +20521,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -21669,31 +20528,24 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
         /// <summary>
         /// Delete a workflow.
         /// </summary>
-        /// <param name="app">The name of the app.</param>
         /// <param name="id">The ID of the workflow to update.</param>
         /// <returns>Workflow deleted.</returns>
         /// <exception cref="SquidexManagementException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<WorkflowsDto> DeleteWorkflowAsync(string app, string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public virtual async System.Threading.Tasks.Task<WorkflowsDto> DeleteWorkflowAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
-            if (app == null)
-                throw new System.ArgumentNullException("app");
-
             if (id == null)
                 throw new System.ArgumentNullException("id");
 
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append("api/apps/{app}/workflows/{id}");
-            urlBuilder_.Replace("{app}", System.Uri.EscapeDataString(ConvertToString(app, System.Globalization.CultureInfo.InvariantCulture)));
+            urlBuilder_.Replace("{app}", _options.AppName);
             urlBuilder_.Replace("{id}", System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture)));
 
-            var client_ = _httpClientProvider.Get();
+            var client_ = _options.ClientProvider.Get();
             try
             {
                 using (var request_ = new System.Net.Http.HttpRequestMessage())
                 {
-
-                    request_.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, app);
-
                     request_.Method = new System.Net.Http.HttpMethod("DELETE");
                     request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
 
@@ -21768,7 +20620,6 @@ private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
             }
             finally
             {
-                _httpClientProvider.Return(client_);
             }
         }
 
@@ -21785,8 +20636,6 @@ public ObjectResponseResult(T responseObject, string responseText)
             public string Text { get; }
         }
 
-        public bool ReadResponseAsString { get; set; }
-
         protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
         {
             if (response == null || response.Content == null)
@@ -21794,7 +20643,7 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 return new ObjectResponseResult<T>(default(T), string.Empty);
             }
 
-            if (ReadResponseAsString)
+            if (_options.ReadResponseAsString)
             {
                 var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SpecialHeaders.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SpecialHeaders.cs
deleted file mode 100644
index 39addbde..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SpecialHeaders.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-namespace Squidex.ClientLibrary;
-
-internal static class SpecialHeaders
-{
-    public const string AppName = "X-App";
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexClient.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexClient.cs
new file mode 100644
index 00000000..3448aab3
--- /dev/null
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexClient.cs
@@ -0,0 +1,268 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using System.Collections.Concurrent;
+using Squidex.ClientLibrary.Management;
+using Squidex.ClientLibrary.Utils;
+
+namespace Squidex.ClientLibrary;
+
+/// <summary>
+/// Default implementation of the <see cref="ISquidexClient"/> interface.
+/// </summary>
+/// <seealso cref="ISquidexClient" />
+public sealed class SquidexClient : ISquidexClient
+{
+    private readonly ConcurrentDictionary<(string, Type, Type), object> contentsClient = new ConcurrentDictionary<(string, Type, Type), object>();
+    private readonly ConcurrentDictionary<string, object> dynamicContentsClient = new ConcurrentDictionary<string, object>();
+    private readonly ConcurrentDictionary<(Type, Type), object> sharedContentsClient = new ConcurrentDictionary<(Type, Type), object>();
+    private IAppsClient appsClient;
+    private IAssetsClient assetsClient;
+    private IBackupsClient backupsClient;
+    private ICommentsClient commentsClient;
+    private IContentsSharedClient<DynamicContent, DynamicData> contentsSharedClient;
+    private IDiagnosticsClient diagnosticsClient;
+    private IEventConsumersClient eventConsumersClient;
+    private IExtendableRulesClient extendableRulesClient;
+    private IHistoryClient historyClient;
+    private ILanguagesClient languagesClient;
+    private IPingClient pingClient;
+    private IPlansClient plansClient;
+    private IRulesClient rulesClient;
+    private ISchemasClient schemasClient;
+    private ISearchClient searchClient;
+    private IStatisticsClient statisticsClient;
+    private ITeamsClient teamsClient;
+    private ITemplatesClient templatesClient;
+    private ITranslationsClient translationsClient;
+    private IUserManagementClient userManagementClient;
+    private IUsersClient usersClient;
+
+    /// <inheritdoc/>
+    public SquidexOptions Options { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SquidexClient"/> class with the options.
+    /// </summary>
+    /// <param name="options">The options. Cannot be null.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="options"/> is null.</exception>
+    public SquidexClient(SquidexOptions options)
+    {
+        Guard.NotNull(options, nameof(options));
+
+        options.CheckAndFreeze();
+        Options = options;
+    }
+
+    /// <inheritdoc/>
+    public string? GenerateImageUrl(string? id)
+    {
+        if (id == null)
+        {
+            return null;
+        }
+
+        if (!string.IsNullOrWhiteSpace(Options.AssetCDN))
+        {
+            return GenerateUrl(Options.AssetCDN, id);
+        }
+
+        return GenerateUrl(Options.Url, $"api/assets/{id}");
+    }
+
+    /// <inheritdoc/>
+    public string? GenerateImageUrl(IEnumerable<string>? id)
+    {
+        return GenerateImageUrl(id?.FirstOrDefault());
+    }
+
+    /// <inheritdoc />
+    public string? GenerateUrl(string? relativeUrl)
+    {
+        return GenerateUrl(Options.Url, relativeUrl);
+    }
+
+    /// <inheritdoc />
+    public string? GenerateAssetCDNUrl(string relativeUrl)
+    {
+        return GenerateUrl(Options.AssetCDN, relativeUrl);
+    }
+
+    /// <inheritdoc />
+    public string? GenerateContentCDNUrl(string relativeUrl)
+    {
+        return GenerateUrl(Options.ContentCDN, relativeUrl);
+    }
+
+    private static string? GenerateUrl(string baseUrl, string? relativeUrl)
+    {
+        if (relativeUrl == null)
+        {
+            return null;
+        }
+
+        if (string.IsNullOrWhiteSpace(baseUrl))
+        {
+            throw new InvalidOperationException("URL is not configured.");
+        }
+
+        return $"{baseUrl}{relativeUrl.TrimStart('/')}";
+    }
+
+    /// <inheritdoc/>
+    public IAppsClient Apps
+    {
+        get => appsClient ??= new AppsClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IAssetsClient Assets
+    {
+        get => assetsClient ??= new AssetsClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IBackupsClient Backups
+    {
+        get => backupsClient ??= new BackupsClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public ICommentsClient Comments
+    {
+        get => commentsClient ??= new CommentsClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IContentsSharedClient<DynamicContent, DynamicData> SharedDynamicContents
+    {
+        get => contentsSharedClient ??= new ContentsSharedClient<DynamicContent, DynamicData>(Options);
+    }
+
+    /// <inheritdoc/>
+    public IDiagnosticsClient Diagnostics
+    {
+        get => diagnosticsClient ??= new DiagnosticsClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IEventConsumersClient EventConsumers
+    {
+        get => eventConsumersClient ??= new EventConsumersClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IExtendableRulesClient ExtendableRules
+    {
+        get => extendableRulesClient ??= new ExtendableRulesClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IHistoryClient History
+    {
+        get => historyClient ??= new HistoryClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public ILanguagesClient Languages
+    {
+        get => languagesClient ??= new LanguagesClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IPingClient Ping
+    {
+        get => pingClient ??= new PingClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IPlansClient Plans
+    {
+        get => plansClient ??= new PlansClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IRulesClient Rules
+    {
+        get => rulesClient ??= new RulesClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public ISchemasClient Schemas
+    {
+        get => schemasClient ??= new SchemasClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public ISearchClient Search
+    {
+        get => searchClient ??= new SearchClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IStatisticsClient Statistics
+    {
+        get => statisticsClient ??= new StatisticsClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public ITeamsClient Teams
+    {
+        get => teamsClient ??= new TeamsClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public ITemplatesClient Templates
+    {
+        get => templatesClient ??= new TemplatesClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public ITranslationsClient Translations
+    {
+        get => translationsClient ??= new TranslationsClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IUsersClient Users
+    {
+        get => usersClient ??= new UsersClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IUserManagementClient UserManagement
+    {
+        get => userManagementClient ??= new UserManagementClient(Options);
+    }
+
+    /// <inheritdoc/>
+    public IContentsClient<TEntity, TData> Contents<TEntity, TData>(string schemaName) where TEntity : Content<TData> where TData : class, new()
+    {
+        return (IContentsClient<TEntity, TData>)contentsClient.GetOrAdd((schemaName, typeof(TEntity), typeof(TData)), k =>
+            new ContentsClient<TEntity, TData>(Options, k.Item1));
+    }
+
+    /// <inheritdoc/>
+    public IContentsClient<DynamicContent, DynamicData> DynamicContents(string schemaName)
+    {
+        return (IContentsClient<DynamicContent, DynamicData>)dynamicContentsClient.GetOrAdd(schemaName, k =>
+            new ContentsClient<DynamicContent, DynamicData>(Options, k));
+    }
+
+    /// <inheritdoc/>
+    public IContentsSharedClient<TEntity, TData> SharedContents<TEntity, TData>() where TEntity : Content<TData> where TData : class, new()
+    {
+        return (IContentsSharedClient<TEntity, TData>)sharedContentsClient.GetOrAdd((typeof(TEntity), typeof(TData)), k =>
+            new ContentsSharedClient<TEntity, TData>(Options));
+    }
+
+    /// <inheritdoc/>
+    public HttpClient CreateHttpClient()
+    {
+        return Options.ClientProvider.Get();
+    }
+}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexClientManager.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexClientManager.cs
deleted file mode 100644
index 391aa00d..00000000
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexClientManager.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-using Squidex.ClientLibrary.Management;
-using Squidex.ClientLibrary.Utils;
-
-namespace Squidex.ClientLibrary;
-
-/// <summary>
-/// Default implementation of the <see cref="ISquidexClientManager"/> interface.
-/// </summary>
-/// <seealso cref="ISquidexClientManager" />
-public sealed class SquidexClientManager : ISquidexClientManager
-{
-    /// <inheritdoc/>
-    public string App
-    {
-        get { return Options.AppName; }
-    }
-
-    /// <inheritdoc/>
-    public SquidexOptions Options { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SquidexClientManager"/> class with the options.
-    /// </summary>
-    /// <param name="options">The options. Cannot be null.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="options"/> is null.</exception>
-    public SquidexClientManager(SquidexOptions options)
-    {
-        Guard.NotNull(options, nameof(options));
-
-        options.CheckAndFreeze();
-        Options = options;
-    }
-
-    /// <inheritdoc/>
-    public string? GenerateImageUrl(string? id)
-    {
-        if (id == null)
-        {
-            return null;
-        }
-
-        if (!string.IsNullOrWhiteSpace(Options.AssetCDN))
-        {
-            return GenerateUrl(Options.AssetCDN, id);
-        }
-
-        return GenerateUrl(Options.Url, $"api/assets/{id}");
-    }
-
-    /// <inheritdoc/>
-    public string? GenerateImageUrl(IEnumerable<string>? id)
-    {
-        return GenerateImageUrl(id?.FirstOrDefault());
-    }
-
-    /// <inheritdoc />
-    public string? GenerateUrl(string? relativeUrl)
-    {
-        return GenerateUrl(Options.Url, relativeUrl);
-    }
-
-    /// <inheritdoc />
-    public string? GenerateAssetCDNUrl(string relativeUrl)
-    {
-        return GenerateUrl(Options.AssetCDN, relativeUrl);
-    }
-
-    /// <inheritdoc />
-    public string? GenerateContentCDNUrl(string relativeUrl)
-    {
-        return GenerateUrl(Options.ContentCDN, relativeUrl);
-    }
-
-    private static string? GenerateUrl(string baseUrl, string? relativeUrl)
-    {
-        if (relativeUrl == null)
-        {
-            return null;
-        }
-
-        if (string.IsNullOrWhiteSpace(baseUrl))
-        {
-            throw new InvalidOperationException("URL is not configured.");
-        }
-
-        return $"{baseUrl}{relativeUrl.TrimStart('/')}";
-    }
-
-    /// <inheritdoc/>
-    public IAppsClient CreateAppsClient()
-    {
-        return new AppsClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IAssetsClient CreateAssetsClient()
-    {
-        return new AssetsClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IBackupsClient CreateBackupsClient()
-    {
-        return new BackupsClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public ICommentsClient CreateCommentsClient()
-    {
-        return new CommentsClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IDiagnosticsClient CreateDiagnosticsClient()
-    {
-        return new DiagnosticsClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IEventConsumersClient CreateEventConsumersClient()
-    {
-        return new EventConsumersClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IHistoryClient CreateHistoryClient()
-    {
-        return new HistoryClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public ILanguagesClient CreateLanguagesClient()
-    {
-        return new LanguagesClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IPingClient CreatePingClient()
-    {
-        return new PingClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IPlansClient CreatePlansClient()
-    {
-        return new PlansClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IRulesClient CreateRulesClient()
-    {
-        return new RulesClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public ISchemasClient CreateSchemasClient()
-    {
-        return new SchemasClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public ISearchClient CreateSearchClient()
-    {
-        return new SearchClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IStatisticsClient CreateStatisticsClient()
-    {
-        return new StatisticsClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public ITeamsClient CreateTeamsClient()
-    {
-        return new TeamsClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public ITemplatesClient CreateTemplatesClient()
-    {
-        return new TemplatesClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public ITranslationsClient CreateTranslationsClient()
-    {
-        return new TranslationsClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IUsersClient CreateUsersClient()
-    {
-        return new UsersClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IUserManagementClient CreateUserManagementClient()
-    {
-        return new UserManagementClient(Options.ClientProvider)
-        {
-            ReadResponseAsString = Options.ReadResponseAsString
-        };
-    }
-
-    /// <inheritdoc/>
-    public IExtendableRulesClient CreateExtendableRulesClient(string? appName = null)
-    {
-        return new ExtendableRulesClient(Options, appName ?? Options.AppName, Options.ClientProvider);
-    }
-
-    /// <inheritdoc/>
-    public IContentsClient<TEntity, TData> CreateContentsClient<TEntity, TData>(string schemaName) where TEntity : Content<TData> where TData : class, new()
-    {
-        return CreateContentsClient<TEntity, TData>(Options.AppName, schemaName);
-    }
-
-    /// <inheritdoc/>
-    public IContentsClient<TEntity, TData> CreateContentsClient<TEntity, TData>(string appName, string schemaName) where TEntity : Content<TData> where TData : class, new()
-    {
-        return new ContentsClient<TEntity, TData>(Options, appName, schemaName, Options.ClientProvider);
-    }
-
-    /// <inheritdoc/>
-    public IContentsClient<DynamicContent, DynamicData> CreateDynamicContentsClient(string schemaName)
-    {
-        return CreateDynamicContentsClient(Options.AppName, schemaName);
-    }
-
-    /// <inheritdoc/>
-    public IContentsClient<DynamicContent, DynamicData> CreateDynamicContentsClient(string appName, string schemaName)
-    {
-        return new ContentsClient<DynamicContent, DynamicData>(Options, appName, schemaName, Options.ClientProvider);
-    }
-
-    /// <inheritdoc/>
-    public IContentsSharedClient<TEntity, TData> CreateSharedContentsClient<TEntity, TData>(string? appName = null) where TEntity : Content<TData> where TData : class, new()
-    {
-        return new ContentsSharedClient<TEntity, TData>(Options, appName ?? Options.AppName, Options.ClientProvider);
-    }
-
-    /// <inheritdoc/>
-    public IContentsSharedClient<DynamicContent, DynamicData> CreateSharedDynamicContentsClient(string? appName = null)
-    {
-        return new ContentsSharedClient<DynamicContent, DynamicData>(Options, appName ?? Options.AppName, Options.ClientProvider);
-    }
-
-    /// <inheritdoc/>
-    public HttpClient CreateHttpClient()
-    {
-        return Options.ClientProvider.Get();
-    }
-
-    /// <inheritdoc/>
-    public void ReturnHttpClient(HttpClient httpClient)
-    {
-        Options.ClientProvider.Return(httpClient);
-    }
-}
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexOptions.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexOptions.cs
index ac8edb83..db1f84d9 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexOptions.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexOptions.cs
@@ -10,7 +10,7 @@
 namespace Squidex.ClientLibrary;
 
 /// <summary>
-/// The options to configure <see cref="SquidexClientManager"/>.
+/// The options to configure <see cref="SquidexClient"/>.
 /// </summary>
 public class SquidexOptions : OptionsBase
 {
@@ -21,13 +21,11 @@ public class SquidexOptions : OptionsBase
     private string contentCDN;
     private string assetCDN;
     private bool readResponseAsString;
+    private bool ignoreSelfSignedCertificates;
     private IAuthenticator authenticator;
-    private IHttpConfigurator configurator;
     private IHttpClientProvider clientProvider;
-    private IHttpClientFactory clientFactory;
-    private TimeSpan httpClientTimeout;
+    private TimeSpan? timeout;
     private TimeSpan tokenRetryTime = TimeSpan.FromHours(1);
-    private IReadOnlyDictionary<string, AppCredentials>? appCredentials;
 
     /// <summary>
     /// Gets or sets the URL to the Squidex installation.
@@ -127,42 +125,28 @@ public bool ReadResponseAsString
     }
 
     /// <summary>
-    /// Gets or sets the authenticator.
+    /// Gets or sets a value indicating whether self signed certifcates are accepted.
     /// </summary>
     /// <value>
-    /// The authenticator. This is a required option.
+    ///   <c>true</c> if signed certifcates are accepted; otherwise, <c>false</c>.
     /// </value>
-    /// <exception cref="InvalidOperationException">Option is frozen and cannot be changed anymore.</exception>
-    public IAuthenticator Authenticator
+    public bool IgnoreSelfSignedCertificates
     {
-        get => authenticator;
-        set => Set(ref authenticator, value);
+        get => ignoreSelfSignedCertificates;
+        set => Set(ref ignoreSelfSignedCertificates, value);
     }
 
     /// <summary>
-    /// Gets or sets the configurator that can be used to make changes to the HTTP requests.
-    /// </summary>
-    /// <value>
-    /// The configurator.
-    /// </value>
-    /// <exception cref="InvalidOperationException">Option is frozen and cannot be changed anymore.</exception>
-    public IHttpConfigurator Configurator
-    {
-        get => configurator;
-        set => Set(ref configurator, value);
-    }
-
-    /// <summary>
-    /// Gets or sets the client factory.
+    /// Gets or sets the authenticator.
     /// </summary>
     /// <value>
-    /// The client factory.
+    /// The authenticator. This is a required option.
     /// </value>
     /// <exception cref="InvalidOperationException">Option is frozen and cannot be changed anymore.</exception>
-    public IHttpClientFactory ClientFactory
+    public IAuthenticator Authenticator
     {
-        get => clientFactory;
-        set => Set(ref clientFactory, value);
+        get => authenticator;
+        set => Set(ref authenticator, value);
     }
 
     /// <summary>
@@ -185,10 +169,10 @@ public IHttpClientProvider ClientProvider
     /// The HTTP client timeout.
     /// </value>
     /// <exception cref="InvalidOperationException">Option is frozen and cannot be changed anymore.</exception>
-    public TimeSpan HttpClientTimeout
+    public TimeSpan? Timeout
     {
-        get => httpClientTimeout;
-        set => Set(ref httpClientTimeout, value);
+        get => timeout;
+        set => Set(ref timeout, value);
     }
 
     /// <summary>
@@ -204,19 +188,6 @@ public TimeSpan TokenRetryTime
         set => Set(ref tokenRetryTime, value);
     }
 
-    /// <summary>
-    /// Gets or sets credentials for specific apps.
-    /// </summary>
-    /// <value>
-    /// The app credentials.
-    /// </value>
-    /// <exception cref="InvalidOperationException">Option is frozen and cannot be changed anymore.</exception>
-    public IReadOnlyDictionary<string, AppCredentials>? AppCredentials
-    {
-        get => appCredentials;
-        set => Set(ref appCredentials, value);
-    }
-
     /// <summary>
     /// Validates the options.
     /// </summary>
@@ -261,19 +232,9 @@ public void CheckAndFreeze()
         }
 
 #pragma warning disable IDE0074 // Use compound assignment
-        if (configurator == null)
-        {
-            configurator = NoopHttpConfigurator.Instance;
-        }
-
-        if (clientFactory == null)
+        if (timeout == TimeSpan.Zero)
         {
-            clientFactory = NoopHttpConfigurator.Instance;
-        }
-
-        if (httpClientTimeout == TimeSpan.Zero)
-        {
-            httpClientTimeout = TimeSpan.FromSeconds(100);
+            timeout = TimeSpan.FromSeconds(100);
         }
 
         if (authenticator == null)
@@ -288,23 +249,7 @@ public void CheckAndFreeze()
                 throw new ArgumentException("Client secret is not defined.", nameof(ClientSecret));
             }
 
-            if (appCredentials != null)
-            {
-                var newCredentials = new Dictionary<string, AppCredentials>(StringComparer.OrdinalIgnoreCase);
-
-                foreach (var kvp in appCredentials)
-                {
-                    kvp.Value.CheckAndFreeze();
-
-                    newCredentials[kvp.Key.ToLowerInvariant()] = kvp.Value;
-                }
-
-                appCredentials = newCredentials;
-            }
-
-            var squidexAuthenticator = new Authenticator(this);
-
-            authenticator = new CachingAuthenticator(squidexAuthenticator);
+            authenticator = new CachingAuthenticator(new Authenticator(this));
         }
 
         if (clientProvider == null)
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/AuthenticatingHttpMessageHandler.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/AuthenticatingHttpMessageHandler.cs
index 07c9984b..da3ccf1a 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/AuthenticatingHttpMessageHandler.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/AuthenticatingHttpMessageHandler.cs
@@ -15,18 +15,18 @@ namespace Squidex.ClientLibrary.Utils;
 /// </summary>
 public sealed class AuthenticatingHttpMessageHandler : DelegatingHandler
 {
-    private readonly IAuthenticator authenticator;
+    private readonly SquidexOptions options;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AuthenticatingHttpMessageHandler"/> class with the authenticator.
     /// </summary>
-    /// <param name="authenticator">The authenticator. Cannot be null.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="authenticator"/> is null.</exception>
-    public AuthenticatingHttpMessageHandler(IAuthenticator authenticator)
+    /// <param name="options">The options. Cannot be null.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="options"/> is null.</exception>
+    public AuthenticatingHttpMessageHandler(SquidexOptions options)
     {
-        Guard.NotNull(authenticator, nameof(authenticator));
+        Guard.NotNull(options, nameof(options));
 
-        this.authenticator = authenticator;
+        this.options = options;
     }
 
     /// <inheritdoc/>
@@ -38,20 +38,18 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
             return base.SendAsync(request, cancellationToken);
         }
 
-        if (!authenticator.ShouldIntercept(request))
+        if (!options.Authenticator.ShouldIntercept(request))
         {
             return base.SendAsync(request, cancellationToken);
         }
 
-        var appName = GetAppName(request);
-
-        return InterceptAsync(request, appName, true, cancellationToken);
+        return InterceptAsync(request, true, cancellationToken);
     }
 
-    private async Task<HttpResponseMessage> InterceptAsync(HttpRequestMessage request, string appName, bool retry,
+    private async Task<HttpResponseMessage> InterceptAsync(HttpRequestMessage request, bool retry,
         CancellationToken cancellationToken)
     {
-        var token = await authenticator.GetBearerTokenAsync(appName, cancellationToken);
+        var token = await options.Authenticator.GetBearerTokenAsync(options.AppName, cancellationToken);
 
         request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
 
@@ -59,28 +57,14 @@ private async Task<HttpResponseMessage> InterceptAsync(HttpRequestMessage reques
 
         if (response.StatusCode == HttpStatusCode.Unauthorized)
         {
-            await authenticator.RemoveTokenAsync(appName, token, cancellationToken);
+            await options.Authenticator.RemoveTokenAsync(options.AppName, token, cancellationToken);
 
             if (retry)
             {
-                return await InterceptAsync(request, appName, false, cancellationToken);
+                return await InterceptAsync(request, false, cancellationToken);
             }
         }
 
         return response;
     }
-
-    private static string GetAppName(HttpRequestMessage request)
-    {
-        var appName = string.Empty;
-
-        if (request.Headers.TryGetValues(SpecialHeaders.AppName, out var appValues))
-        {
-            request.Headers.Remove(SpecialHeaders.AppName);
-
-            appName = appValues.FirstOrDefault() ?? string.Empty;
-        }
-
-        return appName;
-    }
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/SquidexClientBase.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/SquidexClientBase.cs
index 4d0bb14f..3eedbb00 100644
--- a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/SquidexClientBase.cs
+++ b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/Utils/SquidexClientBase.cs
@@ -17,106 +17,68 @@ namespace Squidex.ClientLibrary.Utils;
 public abstract class SquidexClientBase
 {
     /// <summary>
-    /// Gets the name of the App.
+    /// Gets the options of the <see cref="SquidexClient"/>.
     /// </summary>
     /// <value>
-    /// The name of the App.
-    /// </value>
-    public string AppName { get; }
-
-    /// <summary>
-    /// Gets the options of the <see cref="SquidexClientManager"/>.
-    /// </summary>
-    /// <value>
-    /// The options of the <see cref="SquidexClientManager"/>.
+    /// The options of the <see cref="SquidexClient"/>.
     /// </value>
     public SquidexOptions Options { get; }
 
-    /// <summary>
-    /// The http client provider.
-    /// </summary>
-    protected IHttpClientProvider HttpClientProvider { get; }
-
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-    protected internal SquidexClientBase(SquidexOptions options, string appName, IHttpClientProvider httpClientProvider)
+    protected internal SquidexClientBase(SquidexOptions options)
     {
         Guard.NotNull(options, nameof(options));
-        Guard.NotNullOrEmpty(appName, nameof(appName));
-        Guard.NotNull(httpClientProvider, nameof(httpClientProvider));
-
-        // The app name can be different from the options app name.
-        AppName = appName;
 
         // Just pass in the options to have direct access to them.
         Options = options;
-
-        HttpClientProvider = httpClientProvider;
     }
 
     protected internal async Task RequestAsync(HttpMethod method, string path, HttpContent? content, QueryContext? context,
         CancellationToken ct)
     {
-        var httpClient = HttpClientProvider.Get();
-        try
+        var httpClient = Options.ClientProvider.Get();
+
+        using (var request = BuildRequest(method, path, content, context))
         {
-            using (var request = BuildRequest(method, path, content, context))
+            using (var response = await httpClient.SendAsync(request, ct))
             {
-                using (var response = await httpClient.SendAsync(request, ct))
-                {
-                    await EnsureResponseIsValidAsync(response);
-                }
+                await EnsureResponseIsValidAsync(response);
             }
         }
-        finally
-        {
-            HttpClientProvider.Return(httpClient);
-        }
     }
 
     protected internal async Task<Stream> RequestStreamAsync(HttpMethod method, string path, HttpContent? content, QueryContext? context,
         CancellationToken ct)
     {
-        var httpClient = HttpClientProvider.Get();
-        try
+        var httpClient = Options.ClientProvider.Get();
+
+        using (var request = BuildRequest(method, path, content, context))
         {
-            using (var request = BuildRequest(method, path, content, context))
-            {
-                var response = await httpClient.SendAsync(request, ct);
+            var response = await httpClient.SendAsync(request, ct);
 
-                await EnsureResponseIsValidAsync(response);
+            await EnsureResponseIsValidAsync(response);
 #if NET5_0_OR_GREATER
-                return await response.Content.ReadAsStreamAsync(ct);
+            return await response.Content.ReadAsStreamAsync(ct);
 #else
-                return await response.Content.ReadAsStreamAsync();
+            return await response.Content.ReadAsStreamAsync();
 #endif
-            }
-        }
-        finally
-        {
-            HttpClientProvider.Return(httpClient);
         }
     }
 
     protected internal async Task<T> RequestJsonAsync<T>(HttpMethod method, string path, HttpContent? content, QueryContext? context,
         CancellationToken ct)
     {
-        var httpClient = HttpClientProvider.Get();
-        try
+        var httpClient = Options.ClientProvider.Get();
+
+        using (var request = BuildRequest(method, path, content, context))
         {
-            using (var request = BuildRequest(method, path, content, context))
+            using (var response = await httpClient.SendAsync(request, ct))
             {
-                using (var response = await httpClient.SendAsync(request, ct))
-                {
-                    await EnsureResponseIsValidAsync(response);
+                await EnsureResponseIsValidAsync(response);
 
-                    return (await response.Content.ReadAsJsonAsync<T>())!;
-                }
+                return (await response.Content.ReadAsJsonAsync<T>())!;
             }
         }
-        finally
-        {
-            HttpClientProvider.Return(httpClient);
-        }
     }
 
     protected internal HttpRequestMessage BuildRequest(HttpMethod method, string path, HttpContent? content, QueryContext? context)
@@ -128,7 +90,6 @@ protected internal HttpRequestMessage BuildRequest(HttpMethod method, string pat
             request.Content = content;
         }
 
-        request.Headers.TryAddWithoutValidation(SpecialHeaders.AppName, AppName);
         context?.AddToHeaders(request.Headers);
 
         return request;