diff --git a/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj b/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj
index 1f2e558b..29023f83 100644
--- a/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj
+++ b/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
     <BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
     <InvariantGlobalization>true</InvariantGlobalization>
@@ -10,24 +10,24 @@
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.1" />
-    <PackageReference Include="Blazorise.Charts" Version="1.3.1" />
-    <PackageReference Include="Blazorise.Components" Version="1.3.1" />
-    <PackageReference Include="Blazorise.DataGrid" Version="1.3.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
-    <PackageReference Include="Blazorise.Snackbar" Version="1.3.1" />
-    <PackageReference Include="Blazorise.TreeView" Version="1.3.1" />
-    <PackageReference Include="BUTR.CrashReport" Version="13.0.0.22" />
-    <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.22" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.2" />
+    <PackageReference Include="Blazorise.Charts" Version="1.3.2" />
+    <PackageReference Include="Blazorise.Components" Version="1.3.2" />
+    <PackageReference Include="Blazorise.DataGrid" Version="1.3.2" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.2" />
+    <PackageReference Include="Blazorise.Snackbar" Version="1.3.2" />
+    <PackageReference Include="Blazorise.TreeView" Version="1.3.2" />
+    <PackageReference Include="BUTR.CrashReport" Version="13.0.0.30" />
+    <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.30" />
     <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.12" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.2.23480.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.2.23480.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0-rc.2.23480.2" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.2.23479.6" />
     <PackageReference Include="Mono.Cecil" Version="0.11.5" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0-rc.2.23479.6" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0-rc.2.23479.6" />
   </ItemGroup>
 
   <!--
diff --git a/src/BUTR.Site.NexusMods.Client/Models/DemoUser.cs b/src/BUTR.Site.NexusMods.Client/Models/DemoUser.cs
index 8586a4e4..06258110 100644
--- a/src/BUTR.Site.NexusMods.Client/Models/DemoUser.cs
+++ b/src/BUTR.Site.NexusMods.Client/Models/DemoUser.cs
@@ -16,7 +16,7 @@ namespace BUTR.Site.NexusMods.Client.Models;
 public static class DemoUser
 {
     private static readonly ProfileModel _profile =
-        new(31179975, "Pickysaurus", "demo@demo.com", "https://forums.nexusmods.com/uploads/profile/photo-31179975.png", true, true, ApplicationRoles.User, null, null, null, true, new Dictionary<string, string> { {"1", "Bannerlord"} });
+        new(31179975, "Pickysaurus", "demo@demo.com", "https://forums.nexusmods.com/uploads/profile/photo-31179975.png", true, true, ApplicationRoles.User, null, null, null, true, new List<ProfileTenantModel> { new(1, "Bannerlord") });
     private static readonly List<NexusModsModModel> _mods = new()
     {
         new(1, "Demo Mod 1", ImmutableArray<int>.Empty, ImmutableArray<int>.Empty, ImmutableArray<string>.Empty, ImmutableArray<string>.Empty),
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Administration/QuartzManager.razor b/src/BUTR.Site.NexusMods.Client/Pages/Administration/QuartzManager.razor
index 6f08270c..c59cb1de 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Administration/QuartzManager.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Administration/QuartzManager.razor
@@ -63,7 +63,7 @@
                     <DisplayTemplate>@(context.ScheduleFireTimeUtc?.ToString("yyyy-MM-dd HH:mm:ss") ?? string.Empty)</DisplayTemplate>
                 </DataGridColumnDateTime>
                 <DataGridColumnDateTime TItem="QuartzExecutionLogEntity" Field="@nameof(QuartzExecutionLogEntity.FireTimeUtc)" Caption="Actual Fire Time" Filterable Sortable SortField="@nameof(EntityFields.FireTimeUtc)" >
-                    <DisplayTemplate>@(context.FireTimeUtc?.ToString("yyyy-MM-dd HH:mm:ss") ?? string.Empty)</DisplayTemplate>
+                    <DisplayTemplate>@(context.FireTimeUtc.ToString("yyyy-MM-dd HH:mm:ss") ?? string.Empty)</DisplayTemplate>
                 </DataGridColumnDateTime>
                 <DataGridColumnTime TItem="QuartzExecutionLogEntity" Field="@nameof(QuartzExecutionLogEntity.JobRunTime)" Caption="Run Time" Filterable="@false" Sortable SortField="@nameof(EntityFields.JobRunTime)" >
                 </DataGridColumnTime>
@@ -75,7 +75,7 @@
                 </Field>
                 <Field>
                     <FieldLabel>Retry Count</FieldLabel>
-                    <TextEdit Text="@((context.RetryCount ?? 0).ToString())" Disabled  />
+                    <TextEdit Text="@((context.RetryCount).ToString())" Disabled  />
                 </Field>
                 <Field>
                     <FieldLabel>Result</FieldLabel>
@@ -102,7 +102,7 @@
     private DataGridPaging<QuartzExecutionLogEntity>? _dataGridRef;
     
     private async Task<DataGridPaging<QuartzExecutionLogEntity>.ItemsResponse?> Paging(int page, int pageSize, ICollection<Filtering> filters, ICollection<Sorting> sortings, CancellationToken ct) =>
-        await _quartzClient.HistoryPaginatedAsync(new PaginatedQuery(page, pageSize, filters, sortings), ct) is { Data: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
+        await _quartzClient.HistoryPaginatedAsync(new PaginatedQuery(page, pageSize, filters, sortings), ct) is { Value: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
     
     private async Task OnSubmit()
     {
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Administration/RoleManager.razor b/src/BUTR.Site.NexusMods.Client/Pages/Administration/RoleManager.razor
index e7bab49e..e0091b72 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Administration/RoleManager.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Administration/RoleManager.razor
@@ -53,7 +53,7 @@
     {
         try
         {
-            if (await _userClient.SetRoleAsync((int) _model.UserId, _model.Role) is { HumanReadableError: var error } && string.IsNullOrEmpty(error))
+            if (await _userClient.SetRoleAsync((int) _model.UserId, _model.Role) is { Error: not null })
             {
                 await _notificationService.Success(
                     $"Assigned '{_model.Role}' to user with id '{_model.UserId}'!",
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Basic/Profile.razor b/src/BUTR.Site.NexusMods.Client/Pages/Basic/Profile.razor
index ffdc7150..eb217b36 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Basic/Profile.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Basic/Profile.razor
@@ -162,13 +162,13 @@ else
     protected override async Task OnInitializedAsync()
     {
         var userResponse = await _userClient.ProfileAsync();
-        _user = userResponse.Data;
+        _user = userResponse.Value;
 
         if (_user?.DiscordUserId is not null)
         {
             _ = _discordClient.GetUserInfoAsync().ContinueWith(x =>
             {
-                _discordUser = new(x.Result?.Data);
+                _discordUser = new(x.Result?.Value);
                 StateHasChanged();
             });
         }
@@ -177,7 +177,7 @@ else
         {
             _ = _steamClient.GetUserInfoAsync().ContinueWith(x =>
             {
-                _steamUser = new(x.Result?.Data);
+                _steamUser = new(x.Result?.Value);
                 StateHasChanged();
             });
         }
@@ -186,7 +186,7 @@ else
         {
             _ = _gogClient.GetUserInfoAsync().ContinueWith(x =>
             {
-                _gogUser = new(x.Result?.Data);
+                _gogUser = new(x.Result?.Value);
                 StateHasChanged();
             });
         }
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Discord/LinkedRole.razor b/src/BUTR.Site.NexusMods.Client/Pages/Discord/LinkedRole.razor
index 95e03350..0af87d1f 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Discord/LinkedRole.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Discord/LinkedRole.razor
@@ -12,14 +12,14 @@
         await base.OnInitializedAsync();
         
         var response = await _discordClient.GetOAuthUrlAsync();
-        if (response?.Data?.Url is null)
+        if (response?.Value?.Url is null)
         {
             _navigationManager.NavigateTo("profile");
             return;
         }
         
-        await _localStorage.SetItemAsync("discord_state", response.Data.State);
-        _navigationManager.NavigateTo(response.Data.Url);
+        await _localStorage.SetItemAsync("discord_state", response.Value.State);
+        _navigationManager.NavigateTo(response.Value.Url);
     }
 
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Discord/OAuthCallback.razor b/src/BUTR.Site.NexusMods.Client/Pages/Discord/OAuthCallback.razor
index f1491656..5ca3b785 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Discord/OAuthCallback.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Discord/OAuthCallback.razor
@@ -106,7 +106,7 @@
             _ = await _authenticationProvider.ValidateAsync();
 
             var userInfo = await _discordClient.GetUserInfoAsync();
-            _userInfo = new DiscordUserInfo2(userInfo.Data);
+            _userInfo = new DiscordUserInfo2(userInfo.Value);
             _status = "SUCCESS";
             _image = Success;
         }
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/GOG/LinkedRole.razor b/src/BUTR.Site.NexusMods.Client/Pages/GOG/LinkedRole.razor
index 0aa90f71..eecb55d7 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/GOG/LinkedRole.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/GOG/LinkedRole.razor
@@ -46,13 +46,13 @@
         await base.OnInitializedAsync();
         
         var response = await _gogClient.GetOAuthUrlAsync();
-        if (response?.Data?.Url is null)
+        if (response?.Value?.Url is null)
         {
             _navigationManager.NavigateTo("profile");
             return;
         }
         
-        Url = response.Data.Url;
+        Url = response.Value.Url;
     }
 
     private void Callback()
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/GOG/OAuthCallback.razor b/src/BUTR.Site.NexusMods.Client/Pages/GOG/OAuthCallback.razor
index dd29aeb0..f33e0335 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/GOG/OAuthCallback.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/GOG/OAuthCallback.razor
@@ -67,7 +67,7 @@
             _ = await _authenticationProvider.ValidateAsync();
 
             var userInfo = await _gogClient.GetUserInfoAsync();
-            _userInfo = new GOGUserInfo2(userInfo.Data);
+            _userInfo = new GOGUserInfo2(userInfo.Value);
             _status = "SUCCESS";
             _image = Success;
         }
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Moderator/AllowUserModuleId.razor b/src/BUTR.Site.NexusMods.Client/Pages/Moderator/AllowUserModuleId.razor
index b763036e..1969823b 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Moderator/AllowUserModuleId.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Moderator/AllowUserModuleId.razor
@@ -110,7 +110,7 @@
         await _modalRef.Hide();
         if (save && _dataGridRef?.Value is not null && _moduleIdIdToDelete is not null)
         {
-            if (await _userClient.ToModuleManualUnlinkAsync(_dataGridRef.Value.NexusModsUserId, _moduleIdIdToDelete) is { HumanReadableError: var error } && string.IsNullOrEmpty(error))
+            if (await _userClient.ToModuleManualUnlinkAsync(_dataGridRef.Value.NexusModsUserId, _moduleIdIdToDelete) is { Error: not null })
             {
                 await _notificationService.Success($"Disallowed succesfully!", "Success!");
                 await _dataGridRef.Reload();
@@ -149,7 +149,7 @@
     }
 
     private async Task<DataGridPaging<NexusModsUserToModuleManualLinkModel>.ItemsResponse?> GetAllowUserMods(int page, int pageSize, ICollection<Filtering> filterings, ICollection<Sorting> sortings, CancellationToken ct) =>
-        await _userClient.ToModuleManualLinkPaginatedAsync(new(page, pageSize, filterings, sortings), ct) is { Data: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
+        await _userClient.ToModuleManualLinkPaginatedAsync(new(page, pageSize, filterings, sortings), ct) is { Value: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
 
     private async Task OnDisallow(ButtonRowContext<NexusModsUserToModuleManualLinkModel?> context)
     {
@@ -164,7 +164,7 @@
         if (!NexusModsUtils.TryParse(model.UserUrl, out _, out var nexusModsId) && !uint.TryParse(model.UserUrl, out nexusModsId))
             return false;
         
-        return await _userClient.ToModuleManualLinkAsync((int) nexusModsId, model.ModuleId) is { HumanReadableError: var error } && string.IsNullOrEmpty(error);
+        return await _userClient.ToModuleManualLinkAsync((int) nexusModsId, model.ModuleId) is { Error: not null };
     }
     private async Task<bool> DoUserDisallowMod(NexusModsUserToModuleManualLinkModel model)
     {
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Moderator/ManualModuleIdLink.razor b/src/BUTR.Site.NexusMods.Client/Pages/Moderator/ManualModuleIdLink.razor
index 2de9a5a2..2698b042 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Moderator/ManualModuleIdLink.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Moderator/ManualModuleIdLink.razor
@@ -100,7 +100,7 @@
     }
 
     private async Task<DataGridPaging<NexusModsModToModuleModel>.ItemsResponse?> GetManualLinks(int page, int pageSize, ICollection<Filtering> filterings, ICollection<Sorting> sortings, CancellationToken ct) =>
-        await _modClient.ToModuleManualLinkPaginatedAsync(new(page, pageSize, filterings, sortings), ct) is { Data: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
+        await _modClient.ToModuleManualLinkPaginatedAsync(new(page, pageSize, filterings, sortings), ct) is { Value: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
 
     private async Task OnDisallow(ButtonRowContext<NexusModsModToModuleModel?> context)
     {
@@ -115,10 +115,10 @@
         if (!NexusModsUtils.TryParse(model.NexusModsUrl, out _, out var nexusModsId) && !uint.TryParse(model.NexusModsUrl, out nexusModsId))
             return false;
         
-        return await _modClient.ToModuleManualLinkAsync(model.ModuleId, (int) nexusModsId) is { HumanReadableError: var error } && string.IsNullOrEmpty(error);
+        return await _modClient.ToModuleManualLinkAsync(model.ModuleId, (int) nexusModsId) is { Error: not null };
     }
     private async Task<bool> DoManualUnlink(NexusModsModToModuleModel model)
     {
-        return await _modClient.ToModuleManualUnlinkAsync(model.ModuleId) is { HumanReadableError: var error } && string.IsNullOrEmpty(error);
+        return await _modClient.ToModuleManualUnlinkAsync(model.ModuleId) is { Error: not null };
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Steam/LinkedRole.razor b/src/BUTR.Site.NexusMods.Client/Pages/Steam/LinkedRole.razor
index dd7dac28..ed84fcae 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Steam/LinkedRole.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Steam/LinkedRole.razor
@@ -11,13 +11,13 @@
         await base.OnInitializedAsync();
         
         var response = await _steamClient.GetOpenIdUrlAsync();
-        if (response?.Data?.Url is null)
+        if (response?.Value?.Url is null)
         {
             _navigationManager.NavigateTo("profile");
             return;
         }
         
-        _navigationManager.NavigateTo(response.Data.Url);
+        _navigationManager.NavigateTo(response.Value.Url);
     }
 
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Steam/OpenIdCallback.razor b/src/BUTR.Site.NexusMods.Client/Pages/Steam/OpenIdCallback.razor
index 259bdbe9..fa4f2a09 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Steam/OpenIdCallback.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Steam/OpenIdCallback.razor
@@ -88,7 +88,7 @@
             _ = await _authenticationProvider.ValidateAsync();
 
             var userInfo = await _steamClient.GetUserInfoAsync();
-            _userInfo = new SteamUserInfo2(userInfo.Data);
+            _userInfo = new SteamUserInfo2(userInfo.Value);
             _status = "SUCCESS";
             _image = Success;
         }
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Tools/Articles.razor b/src/BUTR.Site.NexusMods.Client/Pages/Tools/Articles.razor
index 88d002af..435c343e 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Tools/Articles.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Tools/Articles.razor
@@ -39,7 +39,7 @@
     private DataGridPaging<NexusModsArticleModel>? _dataGridPagingRef;
 
     private async Task<DataGridPaging<NexusModsArticleModel>.ItemsResponse?> GetArticles(int page, int pageSize, ICollection<Filtering> filterings, ICollection<Sorting> sortings, CancellationToken ct = default) =>
-        await _articlesClient.PaginatedAsync(new PaginatedQuery(page, pageSize, filterings, sortings), ct) is { Data: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
+        await _articlesClient.PaginatedAsync(new PaginatedQuery(page, pageSize, filterings, sortings), ct) is { Value: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
 
     private async Task OnClick(NexusModsArticleModel? mod)
     {
@@ -47,7 +47,7 @@
             await _jsRuntime.InvokeVoidAsync("open", mod.Url(TenantUtils.FromTenantToGameDomain(await _tenantProvider.GetTenantAsync())!), "_blank");
     }
 
-    private async Task<ICollection<string>> GetAutocompleteValues(string filter) => (await _articlesClient.AutocompleteAsync(filter)).Data ?? Array.Empty<string>();
+    private async Task<ICollection<string>> GetAutocompleteValues(string filter) => (await _articlesClient.AutocompleteAsync(filter)).Value ?? Array.Empty<string>();
 
     private static IEnumerable<Filtering> GetFilters(IEnumerable<DataGridColumnInfo> columnInfos)
     {
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Tools/ExposedMods.razor b/src/BUTR.Site.NexusMods.Client/Pages/Tools/ExposedMods.razor
index 690a9e5a..13ec737d 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Tools/ExposedMods.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Tools/ExposedMods.razor
@@ -32,7 +32,7 @@
     private DataGridPaging<ExposedNexusModsModModel>? _dataGridPagingRef;
 
     private async Task<DataGridPaging<ExposedNexusModsModModel>.ItemsResponse?> GetExposedMods(int page, int pageSize, ICollection<Filtering> filterings, ICollection<Sorting> sortings, CancellationToken ct = default) =>
-        await _exposedModsClient.PaginatedAsync(new PaginatedQuery(page, pageSize, filterings, sortings), ct) is { Data: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
+        await _exposedModsClient.PaginatedAsync(new PaginatedQuery(page, pageSize, filterings, sortings), ct) is { Value: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
 
     private async Task OnClick(ExposedNexusModsModModel? mod)
     {
@@ -40,7 +40,7 @@
             await _jsRuntime.InvokeVoidAsync("open", mod.Url(TenantUtils.FromTenantToGameDomain(await _tenantProvider.GetTenantAsync())!), "_blank");
     }
 
-    private async Task<ICollection<string>> GetAutocompleteValues(string filter) => (await _exposedModsClient.AutocompleteAsync(new(filter))).Data ?? Array.Empty<string>();
+    private async Task<ICollection<string>> GetAutocompleteValues(string filter) => (await _exposedModsClient.AutocompleteAsync(new(filter))).Value ?? Array.Empty<string>();
 
     private static IEnumerable<Filtering> GetFilters(IEnumerable<DataGridColumnInfo> columnInfos)
     {
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Tools/GamePublicApiDiff.razor b/src/BUTR.Site.NexusMods.Client/Pages/Tools/GamePublicApiDiff.razor
index 20f5464a..cab9c04a 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Tools/GamePublicApiDiff.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Tools/GamePublicApiDiff.razor
@@ -77,7 +77,7 @@
     protected override async Task OnInitializedAsync()
     {
         var availableDiffs = await _gamePublicApiClient.ListAsync();
-        Nodes.AddRange(availableDiffs.Data?.Select(x => new Node
+        Nodes.AddRange(availableDiffs.Value?.Select(x => new Node
         {
             Type = NodeType.Root,
             Path = x,
@@ -129,7 +129,7 @@
                     {
                         _gamePublicApiClient.TreeFlatAsync(GetPath(node)).ContinueWith(async x =>
                         {
-                            FillNode(node, (await x).Data ?? Array.Empty<string>());
+                            FillNode(node, (await x).Value ?? Array.Empty<string>());
                             StateHasChanged();
                         });
                     }
@@ -145,12 +145,11 @@
                     {
                         _gamePublicApiClient.GetAsync(GetPath(node)).ContinueWith(x =>
                         {
-                            node.Content = x.Result.Data?
-                                .Select(content =>
-                                {
-                                    var title = GetDiffTitle(content);
-                                    return new DiffContent(title, content);
-                                }).ToList() ?? new List<DiffContent>();
+                            node.Content = x.Result.Value?.Select(content =>
+                            {
+                                var title = GetDiffTitle(content);
+                                return new DiffContent(title, content);
+                            }).ToList() ?? new List<DiffContent>();
                             StateHasChanged();
                         });
                     }
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/Tools/GamePublicApiDiffSearch.razor b/src/BUTR.Site.NexusMods.Client/Pages/Tools/GamePublicApiDiffSearch.razor
index ee99e86e..898634a8 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/Tools/GamePublicApiDiffSearch.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/Tools/GamePublicApiDiffSearch.razor
@@ -44,7 +44,7 @@
         var diffs = (await _gamePublicApiClient.SearchAsync(new[]
         {
             new TextSearchFiltering(TextSearchFilteringType.And, str)
-        })).Data ?? Array.Empty<string>();
+        })).Value ?? Array.Empty<string>();
         _diffs = diffs.Select(content =>
         {
             var title = GetDiffTitle(content);
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/User/AllowUserMod.razor b/src/BUTR.Site.NexusMods.Client/Pages/User/AllowUserMod.razor
index c27cd578..3acf39e3 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/User/AllowUserMod.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/User/AllowUserMod.razor
@@ -110,7 +110,7 @@
         await _modalRef.Hide();
         if (save && _dataGridRef?.Value is not null && _userIdToDelete is not null)
         {
-            if (await _userClient.ToNexusModsModManualUnlinkAsync(_userIdToDelete, _dataGridRef.Value.NexusModsModId, CancellationToken.None) is { HumanReadableError: var error } && string.IsNullOrEmpty(error))
+            if (await _userClient.ToNexusModsModManualUnlinkAsync(_userIdToDelete, _dataGridRef.Value.NexusModsModId, CancellationToken.None) is { Error: not null })
             {
                 await _notificationService.Success($"Disallowed succesfully!", "Success!");
                 await _dataGridRef.Reload();
@@ -149,7 +149,7 @@
     }
 
     private async Task<DataGridPaging<NexusModsUserToNexusModsModManualLinkModel>.ItemsResponse?> GetAllowUserMods(int page, int pageSize, ICollection<Filtering> filters, ICollection<Sorting> sortings, CancellationToken ct) =>
-        await _userClient.ToNexusModsModManualLinkPaginatedAsync(new(page, pageSize, filters, sortings), ct) is { Data: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
+        await _userClient.ToNexusModsModManualLinkPaginatedAsync(new(page, pageSize, filters, sortings), ct) is { Value: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
 
     private async Task OnDisallow(ButtonRowContext<NexusModsUserToNexusModsModManualLinkModel?> context)
     {
@@ -167,7 +167,7 @@
         if (!NexusModsUtils.TryParse(model.ModUrl, out _, out var nexusModsModId) && !uint.TryParse(model.ModUrl, out nexusModsModId))
             return false;
         
-        return await _userClient.ToNexusModsModManualLinkAsync((int) nexusModsUserId, (int) nexusModsModId) is { HumanReadableError: var error } && string.IsNullOrEmpty(error);
+        return await _userClient.ToNexusModsModManualLinkAsync((int) nexusModsUserId, (int) nexusModsModId) is { Error: not null };
     }
     private async Task<bool> DoUserDisallowMod(NexusModsUserToNexusModsModManualLinkModel model)
     {
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/User/CrashReportsViewer.razor b/src/BUTR.Site.NexusMods.Client/Pages/User/CrashReportsViewer.razor
index e4737c24..ab3cd636 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/User/CrashReportsViewer.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/User/CrashReportsViewer.razor
@@ -112,7 +112,7 @@
         if (save && _datagridPagingRef?.Value is not null)
         {
             var updatedCrashReport = _datagridPagingRef.Value with { };
-            if (await _crashReportsClient.UpdateAsync(updatedCrashReport) is { HumanReadableError: var error } && string.IsNullOrEmpty(error))
+            if (await _crashReportsClient.UpdateAsync(updatedCrashReport) is { Error: not null })
             {
                 await _notificationService.Success($"Saved Crash Report!", "Success!");
             }
@@ -132,7 +132,7 @@
     private async Task<PagingStreamingData<CrashReportModel2>?> GetCrashReports(int page, int pageSize, ICollection<Filtering> filterings, ICollection<Sorting> sortings, CancellationToken ct = default) =>
         await _crashReportsClient.PaginatedStreamingAsync(new(page, pageSize, filterings, sortings), ct);
 
-    private async Task<ICollection<string>> GetAutocompleteValues(string filter) => await _crashReportsClient.AutocompleteAsync(new(filter)) is { Data: { } data } ? data : Array.Empty<string>();
+    private async Task<ICollection<string>> GetAutocompleteValues(string filter) => await _crashReportsClient.AutocompleteAsync(new(filter)) is { Value: { } data } ? data : Array.Empty<string>();
 
     private IEnumerable<Filtering> GetFilters(IEnumerable<DataGridColumnInfo> columnInfos)
     {
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/User/Mods.razor b/src/BUTR.Site.NexusMods.Client/Pages/User/Mods.razor
index 4156cc20..07b160f1 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/User/Mods.razor
+++ b/src/BUTR.Site.NexusMods.Client/Pages/User/Mods.razor
@@ -110,19 +110,19 @@
         if (!NexusModsUtils.TryParse(model.ModUrl, out _, out var modId) && !uint.TryParse(model.ModUrl, out modId))
             return false;
 
-        return await _userClient.ToNexusModsModLinkAsync((int) modId) is { HumanReadableError: var error } && string.IsNullOrEmpty(error);
+        return await _userClient.ToNexusModsModLinkAsync((int) modId) is { Error: not null };
     }
 
     private async Task<bool> DoUnlinkMod(NexusModsModModel model)
     {
-        return await _userClient.ToNexusModsModUnlinkAsync(model.NexusModsModId) is { HumanReadableError: var error } && string.IsNullOrEmpty(error);
+        return await _userClient.ToNexusModsModUnlinkAsync(model.NexusModsModId) is { Error: not null };
     }
 
     private async Task<DataGridPaging<NexusModsModModel>.ItemsResponse?> GetMods(int page, int pageSize, ICollection<Filtering> filterings, ICollection<Sorting> sortings, CancellationToken ct = default) =>
-        await _userClient.ToNexusModsModPaginatedAsync(new(page, pageSize, filterings, sortings), ct) is { Data: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
+        await _userClient.ToNexusModsModPaginatedAsync(new(page, pageSize, filterings, sortings), ct) is { Value: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
 
     private async Task<DataGridPaging<NexusModsModAvailableModel>.ItemsResponse?> GetAllowedMods(int page, int pageSize, ICollection<Filtering> filterings, ICollection<Sorting> sortings, CancellationToken ct = default) =>
-        await _modClient.AvailablePaginatedAsync(new(page, pageSize, filterings, sortings), ct) is { Data: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
+        await _modClient.AvailablePaginatedAsync(new(page, pageSize, filterings, sortings), ct) is { Value: { } data } ? new(data.Metadata, data.Items, data.AdditionalMetadata) : null;
 
     private async Task OnClick(NexusModsModModel? mod)
     {
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/User/StatisticsExceptionTypes.razor.cs b/src/BUTR.Site.NexusMods.Client/Pages/User/StatisticsExceptionTypes.razor.cs
index c595041e..9706998f 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/User/StatisticsExceptionTypes.razor.cs
+++ b/src/BUTR.Site.NexusMods.Client/Pages/User/StatisticsExceptionTypes.razor.cs
@@ -27,7 +27,7 @@ public partial class StatisticsExceptionTypes
 
     protected override async Task OnInitializedAsync()
     {
-        var data = (await StatisticsClient.TopExceptionsTypesAsync()).Data ?? Array.Empty<TopExceptionsEntry>();
+        var data = (await StatisticsClient.TopExceptionsTypesAsync()).Value ?? Array.Empty<TopExceptionsEntry>();
 
         _dataGridRef.Values = data;
 
diff --git a/src/BUTR.Site.NexusMods.Client/Pages/User/StatisticsInvolved.razor.cs b/src/BUTR.Site.NexusMods.Client/Pages/User/StatisticsInvolved.razor.cs
index 0a60506d..d0f60d2e 100644
--- a/src/BUTR.Site.NexusMods.Client/Pages/User/StatisticsInvolved.razor.cs
+++ b/src/BUTR.Site.NexusMods.Client/Pages/User/StatisticsInvolved.razor.cs
@@ -74,7 +74,7 @@ private async Task Refresh()
         await _lineChart.Clear();
         if (_modIds.Count == 0) return;
 
-        var data = (await StatisticsClient.InvolvedAsync(_gameVersions, _modIds, Array.Empty<string>()))?.Data ?? Array.Empty<GameStorage>();
+        var data = (await StatisticsClient.InvolvedAsync(_gameVersions, _modIds, Array.Empty<string>()))?.Value ?? Array.Empty<GameStorage>();
 
         var allGameVersions = data.Select(x => x.GameVersion).ToArray();
         var allModIdsWithVersions = data
@@ -124,14 +124,14 @@ private async Task OnHandleGameVersionReadData(AutocompleteReadDataEventArgs aut
     {
         if (!autocompleteReadDataEventArgs.CancellationToken.IsCancellationRequested)
         {
-            _gameVersionsAutocompleteValues = (await StatisticsClient.AutocompleteGameVersionAsync(autocompleteReadDataEventArgs.SearchValue)).Data ?? Array.Empty<string>();
+            _gameVersionsAutocompleteValues = (await StatisticsClient.AutocompleteGameVersionAsync(autocompleteReadDataEventArgs.SearchValue)).Value ?? Array.Empty<string>();
         }
     }
     private async Task OnHandleModIdReadData(AutocompleteReadDataEventArgs autocompleteReadDataEventArgs)
     {
         if (!autocompleteReadDataEventArgs.CancellationToken.IsCancellationRequested && autocompleteReadDataEventArgs.SearchValue.Length >= 3)
         {
-            _modIdsAutocompleteValues = (await StatisticsClient.AutocompleteModuleIdAsync(autocompleteReadDataEventArgs.SearchValue)).Data ?? Array.Empty<string>(); ;
+            _modIdsAutocompleteValues = (await StatisticsClient.AutocompleteModuleIdAsync(autocompleteReadDataEventArgs.SearchValue)).Value ?? Array.Empty<string>(); ;
         }
     }
 
diff --git a/src/BUTR.Site.NexusMods.Client/Services/AuthenticationProvider.cs b/src/BUTR.Site.NexusMods.Client/Services/AuthenticationProvider.cs
index 27e4d76d..eff167d9 100644
--- a/src/BUTR.Site.NexusMods.Client/Services/AuthenticationProvider.cs
+++ b/src/BUTR.Site.NexusMods.Client/Services/AuthenticationProvider.cs
@@ -28,7 +28,7 @@ public AuthenticationProvider(IAuthenticationClient client, ITokenContainer toke
 
         try
         {
-            var response = (await _authenticationClient.AuthenticateAsync(apiKey, ct)).Data;
+            var response = (await _authenticationClient.AuthenticateAsync(apiKey, ct)).Value;
 
             await _tokenContainer.SetTokenAsync(new Token(type, response.Token), ct);
 
@@ -54,7 +54,7 @@ public async Task DeauthenticateAsync(CancellationToken ct = default)
 
         try
         {
-            var response = (await _authenticationClient.ValidateAsync(ct)).Data;
+            var response = (await _authenticationClient.ValidateAsync(ct)).Value;
             await _tokenContainer.RefreshTokenAsync(token with { Value = response.Token }, ct);
             return response.Profile;
         }
diff --git a/src/BUTR.Site.NexusMods.Client/Services/CrashReportsClientWithDemo.cs b/src/BUTR.Site.NexusMods.Client/Services/CrashReportsClientWithDemo.cs
index 4cf3a293..27c05591 100644
--- a/src/BUTR.Site.NexusMods.Client/Services/CrashReportsClientWithDemo.cs
+++ b/src/BUTR.Site.NexusMods.Client/Services/CrashReportsClientWithDemo.cs
@@ -52,43 +52,38 @@ public async Task<PagingStreamingData<CrashReportModel2>> PaginatedStreamingAsyn
         return await _implementation.PaginatedStreamingAsync(new PaginatedQuery(body.Page, body.PageSize, body.Filters, body.Sotings), ct);
     }
 
-    public async Task<CrashReportModel2PagingDataAPIResponse> PaginatedAsync(PaginatedQuery? body, CancellationToken ct)
+    public async Task<CrashReportModel2PagingDataAPIResponseActionResult> PaginatedAsync(PaginatedQuery? body, CancellationToken ct)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
         {
             var crashReports = await DemoUser.GetCrashReports(_httpClientFactory).ToListAsync(ct);
-            return new CrashReportModel2PagingDataAPIResponse(new CrashReportModel2PagingData(PagingAdditionalMetadata.Empty, crashReports, new PagingMetadata(1, (int) Math.Ceiling((double) crashReports.Count / body.PageSize), body.PageSize, crashReports.Count)), string.Empty);
+            return new CrashReportModel2PagingDataAPIResponseActionResult(new CrashReportModel2PagingData(PagingAdditionalMetadata.Empty, crashReports, new PagingMetadata(1, (int) Math.Ceiling((double) crashReports.Count / body.PageSize), body.PageSize, crashReports.Count)), null!);
         }
 
         return await _implementation.PaginatedAsync(new PaginatedQuery(body.Page, body.PageSize, body.Filters, body.Sotings), ct);
     }
 
-    public async Task<StringIQueryableAPIResponse> AutocompleteAsync(string? modId, CancellationToken ct)
+    public async Task<StringIQueryableAPIResponseActionResult> AutocompleteAsync(string? modId, CancellationToken ct)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
         {
             var crashReports = await DemoUser.GetCrashReports(_httpClientFactory).ToListAsync(ct);
-            return new StringIQueryableAPIResponse(crashReports.SelectMany(x => x.InvolvedModules).Where(x => x.StartsWith(modId)).ToArray(), string.Empty);
+            return new StringIQueryableAPIResponseActionResult(crashReports.SelectMany(x => x.InvolvedModules).Where(x => x.StartsWith(modId)).ToArray(), null!);
         }
 
-        return new StringIQueryableAPIResponse((await _implementation.AutocompleteAsync(modId, ct)).Data ?? Array.Empty<string>(), string.Empty);
+        return new StringIQueryableAPIResponseActionResult((await _implementation.AutocompleteAsync(modId, ct)).Value ?? Array.Empty<string>(), null!);
     }
 
-    public async Task<StringAPIResponse> UpdateAsync(CrashReportModel2? body, CancellationToken ct)
+    public async Task<StringAPIResponseActionResult> UpdateAsync(CrashReportModel2? body, CancellationToken ct)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
         {
-            return new StringAPIResponse("demo", string.Empty);
+            return new StringAPIResponseActionResult("demo", null!);
         }
 
         return await _implementation.UpdateAsync(body, ct);
     }
-
-    public async Task<ModuleUpdateIEnumerableAPIResponse> GetUpdatesAsync(int? tenant, CrashReportModel? body, CancellationToken ct)
-    {
-        return await _implementation.GetUpdatesAsync(tenant, body, ct);
-    }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Client/Services/HttpClient/TenantDelegatingHandler.cs b/src/BUTR.Site.NexusMods.Client/Services/HttpClient/TenantDelegatingHandler.cs
index b00e6179..e5a496d9 100644
--- a/src/BUTR.Site.NexusMods.Client/Services/HttpClient/TenantDelegatingHandler.cs
+++ b/src/BUTR.Site.NexusMods.Client/Services/HttpClient/TenantDelegatingHandler.cs
@@ -17,7 +17,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
     {
         var tenant = await _tenantProvider.GetTenantAsync();
 
-        request.Headers.Add("Tenant", tenant);
+        request.Headers.Add("Tenant", tenant.ToString());
         return await base.SendAsync(request, ct);
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Client/Services/NexusModsModClientWithDemo.cs b/src/BUTR.Site.NexusMods.Client/Services/NexusModsModClientWithDemo.cs
index 723a4bee..3665f84e 100644
--- a/src/BUTR.Site.NexusMods.Client/Services/NexusModsModClientWithDemo.cs
+++ b/src/BUTR.Site.NexusMods.Client/Services/NexusModsModClientWithDemo.cs
@@ -17,25 +17,28 @@ public NexusModsModClientWithDemo(IServiceProvider serviceProvider, ITokenContai
         _tokenContainer = tokenContainer ?? throw new ArgumentNullException(nameof(tokenContainer));
     }
 
-    public async Task<RawNexusModsModModelAPIResponse> RawAsync(string gameDomain, int modId, CancellationToken ct = default) => await _implementation.RawAsync(gameDomain, modId, ct);
+    public async Task<RawNexusModsModModelAPIResponseActionResult> RawAsync(string gameDomain, int modId, CancellationToken ct = default)
+    {
+        return await _implementation.RawAsync(gameDomain, modId, ct);
+    }
 
-    public async Task<StringAPIResponse> ToModuleManualLinkAsync(string? moduleId = null, int? nexusModsModId = null, CancellationToken ct = default)
+    public async Task<StringAPIResponseActionResult> ToModuleManualLinkAsync(string? moduleId = null, int? nexusModsModId = null, CancellationToken ct = default)
     {
         return await _implementation.ToModuleManualLinkAsync(moduleId, nexusModsModId, ct);
     }
 
-    public async Task<StringAPIResponse> ToModuleManualUnlinkAsync(string? moduleId = null, int? nexusModsModId = null, CancellationToken ct = default)
+    public async Task<StringAPIResponseActionResult> ToModuleManualUnlinkAsync(string? moduleId = null, int? nexusModsModId = null, CancellationToken ct = default)
     {
         return await _implementation.ToModuleManualUnlinkAsync(moduleId, nexusModsModId, ct);
     }
 
-    public async Task<NexusModsModToModuleModelPagingDataAPIResponse> ToModuleManualLinkPaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
+    public async Task<NexusModsModToModuleModelPagingDataAPIResponseActionResult> ToModuleManualLinkPaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
     {
         return await _implementation.ToModuleManualLinkPaginatedAsync(body, ct);
     }
 
-    public async Task<NexusModsModAvailableModelPagingDataAPIResponse> AvailablePaginatedAsync(PaginatedQuery? body = null, CancellationToken cancellationToken = default)
+    public async Task<NexusModsModAvailableModelPagingDataAPIResponseActionResult> AvailablePaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
     {
-        return await _implementation.AvailablePaginatedAsync(body, cancellationToken);
+        return await _implementation.AvailablePaginatedAsync(body, ct);
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Client/Services/NexusModsUserClientWithDemo.cs b/src/BUTR.Site.NexusMods.Client/Services/NexusModsUserClientWithDemo.cs
index f6ae6ca2..4200c264 100644
--- a/src/BUTR.Site.NexusMods.Client/Services/NexusModsUserClientWithDemo.cs
+++ b/src/BUTR.Site.NexusMods.Client/Services/NexusModsUserClientWithDemo.cs
@@ -23,18 +23,18 @@ public NexusModsUserClientWithDemo(IServiceProvider serviceProvider, ITokenConta
         _cache = cache ?? throw new ArgumentNullException(nameof(cache));
     }
 
-    public async Task<ProfileModelAPIResponse> ProfileAsync(CancellationToken ct)
+    public async Task<ProfileModelAPIResponseActionResult> ProfileAsync(CancellationToken ct)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new ProfileModelAPIResponse(await DemoUser.GetProfile(), string.Empty);
+            return new ProfileModelAPIResponseActionResult(await DemoUser.GetProfile(), null!);
 
-        async Task<(ProfileModelAPIResponse, CacheOptions)?> Factory()
+        async Task<(ProfileModelAPIResponseActionResult, CacheOptions)?> Factory()
         {
             try
             {
-                var profile = (await _implementation.ProfileAsync(ct)).Data;
-                return new(new(profile, string.Empty), new CacheOptions
+                var profile = (await _implementation.ProfileAsync(ct)).Value;
+                return new(new(profile, null!), new CacheOptions
                 {
                     AbsoluteExpiration = DateTimeOffset.UtcNow.AddSeconds(5),
                     //ChangeToken = new CancellationChangeToken(_deauthorized.Token),
@@ -46,42 +46,43 @@ public async Task<ProfileModelAPIResponse> ProfileAsync(CancellationToken ct)
             }
         }
 
-        return await _cache.GetAsync("profile", Factory, ct) ?? new ProfileModelAPIResponse(await DemoUser.GetProfile(), "error");
+        return await _cache.GetAsync("profile", Factory, ct) ?? new ProfileModelAPIResponseActionResult(await DemoUser.GetProfile(), new(null, null, null, detail: "error", null));
     }
 
-    public async Task<StringAPIResponse> SetRoleAsync(int? userId, string? role, CancellationToken ct)
+    public async Task<StringAPIResponseActionResult> SetRoleAsync(int? userId, string? role, CancellationToken ct)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new StringAPIResponse("demo", string.Empty);
+            return new StringAPIResponseActionResult("demo", null!);
 
         return await _implementation.SetRoleAsync(userId, role, ct);
     }
 
-    public async Task<StringAPIResponse> RemoveRoleAsync(int? userId, CancellationToken ct)
+    public async Task<StringAPIResponseActionResult> RemoveRoleAsync(int? userId, CancellationToken ct)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new StringAPIResponse("demo", string.Empty);
+            return new StringAPIResponseActionResult("demo", null!);
 
         return await _implementation.RemoveRoleAsync(userId, ct);
     }
 
-    public async Task<NexusModsModModelPagingDataAPIResponse> ToNexusModsModPaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
+    public async Task<NexusModsModModelPagingDataAPIResponseActionResult> ToNexusModsModPaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
         {
             var mods = await DemoUser.GetMods().ToListAsync(ct);
-            return new NexusModsModModelPagingDataAPIResponse(new NexusModsModModelPagingData(PagingAdditionalMetadata.Empty, mods, new PagingMetadata(1, (int) Math.Ceiling((double) mods.Count / (double) body.PageSize), body.PageSize, mods.Count)), string.Empty);
+            return new NexusModsModModelPagingDataAPIResponseActionResult(new NexusModsModModelPagingData(PagingAdditionalMetadata.Empty, mods, new PagingMetadata(1, (int) Math.Ceiling((double) mods.Count / (double) body.PageSize), body.PageSize, mods.Count)), null!);
         }
 
         return await _implementation.ToNexusModsModPaginatedAsync(new PaginatedQuery(body.Page, body.PageSize, Array.Empty<Filtering>(), Array.Empty<Sorting>()), ct);
     }
 
-    public async Task<StringAPIResponse> ToNexusModsModUpdateAsync(NexusModsUserToNexusModsModQuery? body = null, CancellationToken ct = default) => await _implementation.ToNexusModsModUpdateAsync(body, ct);
+    public async Task<StringAPIResponseActionResult> ToNexusModsModUpdateAsync(NexusModsUserToNexusModsModQuery? body = null, CancellationToken ct = default) =>
+        await _implementation.ToNexusModsModUpdateAsync(body, ct);
 
-    public async Task<StringAPIResponse> ToNexusModsModLinkAsync(int? nexusModsModId = null, CancellationToken ct = default)
+    public async Task<StringAPIResponseActionResult> ToNexusModsModLinkAsync(int? nexusModsModId = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
@@ -90,16 +91,16 @@ public async Task<StringAPIResponse> ToNexusModsModLinkAsync(int? nexusModsModId
             if (mods.Find(m => m.NexusModsModId == nexusModsModId) is null)
             {
                 mods.Add(new(nexusModsModId ?? 0, $"Demo Mod {nexusModsModId}", ImmutableArray<int>.Empty, ImmutableArray<int>.Empty, ImmutableArray<string>.Empty, ImmutableArray<string>.Empty));
-                return new StringAPIResponse("demo", string.Empty);
+                return new StringAPIResponseActionResult("demo", null!);
             }
 
-            return new StringAPIResponse(null, "error");
+            return new StringAPIResponseActionResult(null, new(null, null, null, detail: "error", null));
         }
 
         return await _implementation.ToNexusModsModLinkAsync(nexusModsModId, ct);
     }
 
-    public async Task<StringAPIResponse> ToNexusModsModUnlinkAsync(int? nexusModsModId = null, CancellationToken ct = default)
+    public async Task<StringAPIResponseActionResult> ToNexusModsModUnlinkAsync(int? nexusModsModId = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
@@ -108,65 +109,65 @@ public async Task<StringAPIResponse> ToNexusModsModUnlinkAsync(int? nexusModsMod
             if (mods.Find(m => m.NexusModsModId == nexusModsModId) is { } mod)
             {
                 mods.Remove(mod);
-                return new StringAPIResponse("demo", string.Empty);
+                return new StringAPIResponseActionResult("demo", null!);
             }
 
-            return new StringAPIResponse(null, "error");
+            return new StringAPIResponseActionResult(null, new(null, null, null, detail: "error", null));
         }
 
         return await _implementation.ToNexusModsModUnlinkAsync(nexusModsModId, ct);
     }
 
-    public async Task<StringAPIResponse> ToModuleManualLinkAsync(int? nexusModsUserId = null, string? moduleId = null, CancellationToken ct = default)
+    public async Task<StringAPIResponseActionResult> ToModuleManualLinkAsync(int? nexusModsUserId = null, string? moduleId = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new StringAPIResponse("demo", string.Empty);
+            return new StringAPIResponseActionResult("demo", null!);
 
         return await _implementation.ToModuleManualLinkAsync(nexusModsUserId, moduleId, ct);
     }
 
-    public async Task<StringAPIResponse> ToModuleManualUnlinkAsync(int? nexusModsUserId = null, string? moduleId = null, CancellationToken ct = default)
+    public async Task<StringAPIResponseActionResult> ToModuleManualUnlinkAsync(int? nexusModsUserId = null, string? moduleId = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new StringAPIResponse("demo", string.Empty);
+            return new StringAPIResponseActionResult("demo", null!);
 
         return await _implementation.ToModuleManualUnlinkAsync(nexusModsUserId, moduleId, ct);
     }
 
-    public async Task<NexusModsUserToModuleManualLinkModelPagingDataAPIResponse> ToModuleManualLinkPaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
+    public async Task<NexusModsUserToModuleManualLinkModelPagingDataAPIResponseActionResult> ToModuleManualLinkPaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new NexusModsUserToModuleManualLinkModelPagingDataAPIResponse(new NexusModsUserToModuleManualLinkModelPagingData(PagingAdditionalMetadata.Empty, new List<NexusModsUserToModuleManualLinkModel>(), new PagingMetadata(1, 1, body.PageSize, 1)), string.Empty);
+            return new NexusModsUserToModuleManualLinkModelPagingDataAPIResponseActionResult(new NexusModsUserToModuleManualLinkModelPagingData(PagingAdditionalMetadata.Empty, new List<NexusModsUserToModuleManualLinkModel>(), new PagingMetadata(1, 1, body.PageSize, 1)), null!);
 
         return await _implementation.ToModuleManualLinkPaginatedAsync(new PaginatedQuery(body.Page, body.PageSize, Array.Empty<Filtering>(), Array.Empty<Sorting>()), ct);
     }
 
-    public async Task<StringAPIResponse> ToNexusModsModManualLinkAsync(int? userId = null, int? nexusModsModId = null, CancellationToken ct = default)
+    public async Task<StringAPIResponseActionResult> ToNexusModsModManualLinkAsync(int? userId = null, int? nexusModsModId = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new StringAPIResponse("demo", string.Empty);
+            return new StringAPIResponseActionResult("demo", null!);
 
         return await _implementation.ToNexusModsModManualLinkAsync(userId, nexusModsModId, ct);
     }
 
-    public async Task<StringAPIResponse> ToNexusModsModManualUnlinkAsync(int? userId = null, int? nexusModsModId = null, CancellationToken ct = default)
+    public async Task<StringAPIResponseActionResult> ToNexusModsModManualUnlinkAsync(int? userId = null, int? nexusModsModId = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new StringAPIResponse("demo", string.Empty);
+            return new StringAPIResponseActionResult("demo", null!);
 
         return await _implementation.ToNexusModsModManualUnlinkAsync(userId, nexusModsModId, ct);
     }
 
-    public async Task<NexusModsUserToNexusModsModManualLinkModelPagingDataAPIResponse> ToNexusModsModManualLinkPaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
+    public async Task<NexusModsUserToNexusModsModManualLinkModelPagingDataAPIResponseActionResult> ToNexusModsModManualLinkPaginatedAsync(PaginatedQuery? body = null, CancellationToken ct = default)
     {
         var token = await _tokenContainer.GetTokenAsync(ct);
         if (token?.Type.Equals("demo", StringComparison.OrdinalIgnoreCase) == true)
-            return new NexusModsUserToNexusModsModManualLinkModelPagingDataAPIResponse(new NexusModsUserToNexusModsModManualLinkModelPagingData(PagingAdditionalMetadata.Empty, new List<NexusModsUserToNexusModsModManualLinkModel>(), new PagingMetadata(1, 1, body.PageSize, 1)), string.Empty);
+            return new NexusModsUserToNexusModsModManualLinkModelPagingDataAPIResponseActionResult(new NexusModsUserToNexusModsModManualLinkModelPagingData(PagingAdditionalMetadata.Empty, new List<NexusModsUserToNexusModsModManualLinkModel>(), new PagingMetadata(1, 1, body.PageSize, 1)), null!);
 
         return await _implementation.ToNexusModsModManualLinkPaginatedAsync(body, ct);
     }
diff --git a/src/BUTR.Site.NexusMods.Client/Services/TenantProvider.cs b/src/BUTR.Site.NexusMods.Client/Services/TenantProvider.cs
index 833dcc15..267d3a51 100644
--- a/src/BUTR.Site.NexusMods.Client/Services/TenantProvider.cs
+++ b/src/BUTR.Site.NexusMods.Client/Services/TenantProvider.cs
@@ -14,13 +14,13 @@ public TenantProvider(ILocalStorageService localStorage)
         _localStorage = localStorage;
     }
 
-    public async Task<string> GetTenantAsync()
+    public async Task<int> GetTenantAsync()
     {
         if (! await _localStorage.ContainKeyAsync("tenant"))
-            await SetTenantAsync("1");
+            await SetTenantAsync(1);
 
-        return await _localStorage.GetItemAsStringAsync("tenant", CancellationToken.None);
+        return await _localStorage.GetItemAsync<int>("tenant", CancellationToken.None);
     }
 
-    public async Task SetTenantAsync(string tenant) => await _localStorage.SetItemAsStringAsync("tenant", tenant, CancellationToken.None);
+    public async Task SetTenantAsync(int tenant) => await _localStorage.SetItemAsync("tenant", tenant, CancellationToken.None);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Client/Shared/Header.razor b/src/BUTR.Site.NexusMods.Client/Shared/Header.razor
index 29bf02bf..9772157b 100644
--- a/src/BUTR.Site.NexusMods.Client/Shared/Header.razor
+++ b/src/BUTR.Site.NexusMods.Client/Shared/Header.razor
@@ -44,12 +44,12 @@
                                     @_currentTenant
                                 </BarDropdownToggle>
                                 <BarDropdownMenu Background="@Background.Dark">
-                                    @foreach (var (tenant, name) in _user?.AvailableTenants ?? new Dictionary<string, string>())
+                                    @foreach (var kv in _user?.AvailableTenants ?? Enumerable.Empty<ProfileTenantModel>())
                                     {
-                                        if (_currentTenant == name) continue;
+                                        if (_currentTenant == kv.Name) continue;
 
                                         <BarDropdownItem Background="@Background.Dark">
-                                            <BarLink Clicked="async () => await SwitchTenantAsync(tenant)">@name</BarLink>
+                                            <BarLink Clicked="@(async () => await SwitchTenantAsync(kv.TenantId))">@kv.Name</BarLink>
                                         </BarDropdownItem>
                                     }
                                 </BarDropdownMenu>
@@ -208,7 +208,7 @@
         if (state.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role) is { } claim && claim.Value !=  ApplicationRoles.Anonymous)
         {
             var response = await _userClient.ProfileAsync();
-            _user = response.Data;
+            _user = response.Value;
             StateHasChanged();
         }
 
@@ -216,7 +216,7 @@
         _currentTenant = TenantUtils.FromTenantToName(currentTenantId);
     }
 
-    private async Task SwitchTenantAsync(string value)
+    private async Task SwitchTenantAsync(int value)
     {
         await _tenantProvider.SetTenantAsync(value);
         _navigationManager.NavigateTo(_navigationManager.Uri, true);
diff --git a/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj b/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj
index ef9e6a0a..4df5dcb8 100644
--- a/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj
+++ b/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>preview</LangVersion>
 
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
@@ -17,27 +18,25 @@
     <PackageReference Include="Aragas.Extensions.Options.FluentValidation" Version="1.1.0.14" />
     <PackageReference Include="Bannerlord.ModuleManager" Version="5.0.214" />
     <PackageReference Include="BUTR.Authentication.NexusMods" Version="1.0.0.6" />
-    <PackageReference Include="BUTR.CrashReport" Version="13.0.0.22" />
-    <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.22" />
+    <PackageReference Include="BUTR.CrashReport" Version="13.0.0.30" />
+    <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.30" />
     <PackageReference Include="Community.Microsoft.Extensions.Caching.PostgreSql" Version="4.0.4" />
-    <PackageReference Include="DynamicExpressions.NET" Version="1.1.0" />
-    <PackageReference Include="ICSharpCode.Decompiler" Version="8.1.1.7464" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.23419.6" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0-rc.1.23421.29" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.2.23480.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0-rc.2.23480.2" />
     <PackageReference Include="Mono.Posix" Version="7.1.0-final.1.21458.1" />
-    <PackageReference Include="MoreAsyncLINQ" Version="0.8.0" />
     <PackageReference Include="Nerdbank.Streams" Version="2.10.72" />
-    <PackageReference Include="Npgsql" Version="8.0.0-preview.4" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.1" />
-    <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.0-preview.4" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
+    <PackageReference Include="Npgsql" Version="8.0.0-rtm-ci.20231026T215802" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
+    <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.0-rtm-ci.20231026T215802" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0-alpha.1" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol.Logs" Version="1.5.0-rc.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.1-beta.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.7" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.5.1-beta.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.5.1-beta.1" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0-alpha.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0-beta.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.8" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.2" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.2" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.3" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-alpha.3" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
@@ -51,8 +50,9 @@
     <PackageReference Include="SharpCompress" Version="0.34.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-    <PackageReference Include="Vogen" Version="3.0.21" />
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.0.0-rc.1.23419.6-03" />
+    <PackageReference Include="Vogen" Version="3.0.22" />
+    <PackageReference Update="GitVersion.MsBuild" Version="5.11.1" />
+    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="8.0.0-rc.2.23480.1-02" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/AppContextSaveScope.cs b/src/BUTR.Site.NexusMods.Server/Contexts/AppContextSaveScope.cs
deleted file mode 100644
index a327f1dc..00000000
--- a/src/BUTR.Site.NexusMods.Server/Contexts/AppContextSaveScope.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace BUTR.Site.NexusMods.Server.Contexts;
-
-public sealed class AppContextSaveScope : IAsyncDisposable
-{
-    private readonly IAppDbContextWrite _dbContextWrite;
-
-    public AppContextSaveScope(IAppDbContextWrite dbContextWrite)
-    {
-        _dbContextWrite = dbContextWrite;
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        await _dbContextWrite.SaveAsync(CancellationToken.None);
-    }
-}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextRead.cs b/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextRead.cs
index cb551f1f..7fb0bfb6 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextRead.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextRead.cs
@@ -4,22 +4,27 @@
 using Microsoft.Extensions.Options;
 
 using System;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace BUTR.Site.NexusMods.Server.Contexts;
 
 public sealed class AppDbContextRead : BaseAppDbContext, IAppDbContextRead
 {
+    public static Exception WriteNotSupported() => throw new NotSupportedException($"Write operations not supported with '{nameof(AppDbContextRead)}'!");
+
+    
     private readonly IDbContextFactory<AppDbContextRead> _dbContextFactory;
 
     public AppDbContextRead(
         IDbContextFactory<AppDbContextRead> dbContextFactory,
-        IOptions<ConnectionStringsOptions> connectionStringOptions,
-        DbContextOptions<AppDbContextRead> options,
-        IEntityConfigurationFactory entityConfigurationFactory) : base(connectionStringOptions, options, entityConfigurationFactory)
+        IOptions<ConnectionStringsOptions> connectionStringsOptions,
+        IEntityConfigurationFactory entityConfigurationFactory,
+        IOptions<JsonSerializerOptions> jsonSerializerOptions,
+        DbContextOptions<AppDbContextRead> options) : base(connectionStringsOptions, entityConfigurationFactory, jsonSerializerOptions, options)
     {
-        _dbContextFactory = dbContextFactory ?? throw new ArgumentNullException(nameof(dbContextFactory));
-        ChangeTracker.AutoDetectChangesEnabled = false;
-        ChangeTracker.LazyLoadingEnabled = false;
+        _dbContextFactory = dbContextFactory;
     }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -32,5 +37,15 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         base.OnConfiguring(optionsBuilder);
     }
 
-    public AppDbContextRead Create() => _dbContextFactory.CreateDbContext();
+    public AppDbContextRead New() => _dbContextFactory.CreateDbContext();
+
+    public override int SaveChanges(bool acceptAllChangesOnSuccess)
+    {
+        throw WriteNotSupported();
+    }
+
+    public override Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = new CancellationToken())
+    {
+        throw WriteNotSupported();
+    }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextWrite.cs b/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextWrite.cs
index bba4f3c9..3ce6bdb8 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextWrite.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextWrite.cs
@@ -1,11 +1,16 @@
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 using BUTR.Site.NexusMods.Server.Options;
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Options;
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -13,20 +18,58 @@ namespace BUTR.Site.NexusMods.Server.Contexts;
 
 public sealed class AppDbContextWrite : BaseAppDbContext, IAppDbContextWrite
 {
+    private sealed class AppDbContextSaveScope : IAppDbContextSaveScope
+    {
+        public static AppDbContextSaveScope Create(AppDbContextWrite dbContextWrite, Action onDispose) => new(dbContextWrite, onDispose);
+
+        private readonly AppDbContextWrite _dbContextWrite;
+        private readonly Action _onDispose;
+        private bool _hasCancelled;
+
+        private AppDbContextSaveScope(AppDbContextWrite dbContextWrite, Action onDispose)
+        {
+            _dbContextWrite = dbContextWrite;
+            _onDispose = onDispose;
+        }
+
+        public Task CancelAsync()
+        {
+            if (!_hasCancelled) _hasCancelled = true;
+
+            return Task.CompletedTask;
+        }
+
+        public async ValueTask DisposeAsync()
+        {
+            try
+            {
+                if (!_hasCancelled)
+                {
+                    await _dbContextWrite.SaveAsync(CancellationToken.None);
+                }
+            }
+            finally
+            {
+                _onDispose();
+            }
+        }
+    }
+
     private readonly IDbContextFactory<AppDbContextWrite> _dbContextFactory;
     private readonly ITenantContextAccessor _tenantContextAccessor;
     private EntityFactory? _entityFactory;
+    private List<Func<Task>>? _onSave;
 
     public AppDbContextWrite(
         IDbContextFactory<AppDbContextWrite> dbContextFactory,
-        IOptions<ConnectionStringsOptions> connectionStringOptions,
-        DbContextOptions<AppDbContextWrite> options,
         ITenantContextAccessor tenantContextAccessor,
-        IEntityConfigurationFactory entityConfigurationFactory) : base(connectionStringOptions, options, entityConfigurationFactory)
+        IOptions<ConnectionStringsOptions> connectionStringsOptions,
+        IEntityConfigurationFactory entityConfigurationFactory,
+        IOptions<JsonSerializerOptions> jsonSerializerOptions,
+        DbContextOptions<AppDbContextWrite> options) : base(connectionStringsOptions, entityConfigurationFactory, jsonSerializerOptions, options)
     {
-        _dbContextFactory = dbContextFactory ?? throw new ArgumentNullException(nameof(dbContextFactory));
-        _tenantContextAccessor = tenantContextAccessor ?? throw new ArgumentNullException(nameof(tenantContextAccessor));
-        ChangeTracker.LazyLoadingEnabled = false;
+        _dbContextFactory = dbContextFactory;
+        _tenantContextAccessor = tenantContextAccessor;
     }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -38,47 +81,86 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
         base.OnConfiguring(optionsBuilder);
     }
+    
 
-    public AppDbContextWrite Create() => _dbContextFactory.CreateDbContext();
+    public AppDbContextWrite New() => _dbContextFactory.CreateDbContext();
 
     public EntityFactory GetEntityFactory() => _entityFactory ??= new EntityFactory(_tenantContextAccessor, this);
 
-    public IAsyncDisposable CreateSaveScope() => new AppContextSaveScope(this);
-
-    public void FutureUpsert<TEntity>(Func<IAppDbContextWrite, DbSet<TEntity>> dbset, TEntity entity) where TEntity : class, IEntity =>
-        FutureAction(x => dbset(x).SingleMerge(entity));
-
-    public void FutureUpsert<TEntity>(Func<IAppDbContextWrite, DbSet<TEntity>> dbset, ICollection<TEntity> entities) where TEntity : class, IEntity =>
-        FutureAction(x => dbset(x).BulkMerge(entities));
-
-    public void FutureSyncronize<TEntity>(Func<IAppDbContextWrite, DbSet<TEntity>> dbset, ICollection<TEntity> entities) where TEntity : class, IEntity =>
-        FutureAction(x => dbset(x).BulkSynchronize(entities));
-
-    private void FutureAction(Action<IAppDbContextWrite> action) => this.FutureAction<AppDbContextWrite>(action);
+    public Task<IAppDbContextSaveScope> CreateSaveScopeAsync()
+    {
+        _onSave = new();
+        return Task.FromResult<IAppDbContextSaveScope>(AppDbContextSaveScope.Create(this, () => _onSave = null));
+    }
 
     public async Task SaveAsync(CancellationToken ct)
     {
         if (IsReadOnly)
             throw new NotSupportedException("The Save method is not supported on read-only database contexts.");
 
-        await using var transaction = await Database.BeginTransactionAsync(ct);
-        try
-        {
-            if (_entityFactory is not null) await _entityFactory.SaveCreatedAsync(ct);
-            this.ExecuteFutureAction(false);
-            await this.BulkSaveChangesAsync(o => o.UseInternalTransaction = false, ct);
-            await transaction.CommitAsync(ct);
-        }
-        catch (Exception)
+        if (!ChangeTracker.HasChanges() && _entityFactory is null && _onSave?.Count == 0)
+            return;
+
+        var executionStrategy = Database.CreateExecutionStrategy();
+        await executionStrategy.ExecuteAsync(this, static async (dbContext, ct) =>
         {
-            await transaction.RollbackAsync(ct);
-            throw;
-        }
+            await using var transaction = await dbContext.Database.BeginTransactionAsync(ct);
+            try
+            {
+                if (dbContext._entityFactory is not null)
+                    await dbContext._entityFactory.SaveCreatedAsync(ct);
+
+                foreach (var func in dbContext._onSave ?? Enumerable.Empty<Func<Task>>())
+                    await func();
+
+                await dbContext.BulkSaveChangesAsync(o =>
+                {
+                    o.IncludeGraph = false;
+                    o.LegacyIncludeGraph = false;
+                }, CancellationToken.None);
+
+                await transaction.CommitAsync(ct);
+            }
+            catch (Exception e)
+            {
+                await transaction.RollbackAsync(ct);
+                throw;
+            }
+        }, ct);
+    }
+
+    public Task BulkUpsertAsync<TEntity>(DbSet<TEntity> dbSet, IEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        if (_onSave is null) throw new Exception();
+        if (!ReferenceEquals(dbSet.GetService<ICurrentDbContext>().Context, this)) throw new Exception();
+
+        _onSave.Add(async () => await dbSet.UpsertAsync(entities));
+        return Task.CompletedTask;
+    }
+
+    public Task BulkSynchronizeAsync<TEntity>(DbSet<TEntity> dbSet, IEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        if (_onSave is null) throw new Exception();
+        if (!ReferenceEquals(dbSet.GetService<ICurrentDbContext>().Context, this)) throw new Exception();
+
+        _onSave.Add(async () => await dbSet.SynchronizeAsync(entities));
+        return Task.CompletedTask;
     }
 
-    public override async ValueTask DisposeAsync()
+    public Task BulkUpsertAsync<TEntity>(DbSet<TEntity> dbSet, IAsyncEnumerable<TEntity> entities) where TEntity : class, IEntity
     {
-        await SaveAsync(CancellationToken.None);
-        await base.DisposeAsync();
+        if (_onSave is null) throw new Exception();
+        if (!ReferenceEquals(dbSet.GetService<ICurrentDbContext>().Context, this)) throw new Exception();
+
+        _onSave.Add(async () => await dbSet.UpsertAsync(entities));
+        return Task.CompletedTask;
+    }
+    public Task BulkSynchronizeAsync<TEntity>(DbSet<TEntity> dbSet, IAsyncEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        if (_onSave is null) throw new Exception();
+        if (!ReferenceEquals(dbSet.GetService<ICurrentDbContext>().Context, this)) throw new Exception();
+
+        _onSave.Add(async () => await dbSet.SynchronizeAsync(entities));
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/BaseAppDbContext.cs b/src/BUTR.Site.NexusMods.Server/Contexts/BaseAppDbContext.cs
index 2de6aacf..4aa18f2a 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/BaseAppDbContext.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/BaseAppDbContext.cs
@@ -1,12 +1,14 @@
-using BUTR.Site.NexusMods.Server.Extensions;
-using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Models.Database;
 using BUTR.Site.NexusMods.Server.Options;
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.Options;
 
+using Npgsql;
+
 using System;
+using System.Text.Json;
 
 namespace BUTR.Site.NexusMods.Server.Contexts;
 
@@ -15,8 +17,9 @@ namespace BUTR.Site.NexusMods.Server.Contexts;
 /// </summary>
 public class BaseAppDbContext : DbContext
 {
-    private readonly IEntityConfigurationFactory _entityConfigurationFactory;
     private readonly ConnectionStringsOptions _options;
+    private readonly IEntityConfigurationFactory _entityConfigurationFactory;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
 
     public required bool IsReadOnly { get; set; }
 
@@ -63,16 +66,26 @@ public class BaseAppDbContext : DbContext
 
     public required DbSet<QuartzExecutionLogEntity> QuartzExecutionLogs { get; set; }
 
-    public BaseAppDbContext(IOptions<ConnectionStringsOptions> connectionStringOptions, DbContextOptions<BaseAppDbContext> options, IEntityConfigurationFactory entityConfigurationFactory) : base(options)
+    public BaseAppDbContext(
+        IOptions<ConnectionStringsOptions> option,
+        IEntityConfigurationFactory entityConfigurationFactory,
+        IOptions<JsonSerializerOptions> jsonSerializerOptions,
+        DbContextOptions<BaseAppDbContext> options) : base(options)
     {
-        _entityConfigurationFactory = entityConfigurationFactory ?? throw new ArgumentNullException(nameof(entityConfigurationFactory));
-        _options = connectionStringOptions.Value ?? throw new ArgumentNullException(nameof(connectionStringOptions));
+        _options = option.Value;
+        _entityConfigurationFactory = entityConfigurationFactory;
+        _jsonSerializerOptions = jsonSerializerOptions.Value;
     }
 
-    protected BaseAppDbContext(IOptions<ConnectionStringsOptions> connectionStringOptions, DbContextOptions options, IEntityConfigurationFactory entityConfigurationFactory) : base(options)
+    protected BaseAppDbContext(
+        IOptions<ConnectionStringsOptions> connectionStringsOptions,
+        IEntityConfigurationFactory entityConfigurationFactory,
+        IOptions<JsonSerializerOptions> jsonSerializerOptions,
+        DbContextOptions options) : base(options)
     {
-        _entityConfigurationFactory = entityConfigurationFactory ?? throw new ArgumentNullException(nameof(entityConfigurationFactory));
-        _options = connectionStringOptions.Value ?? throw new ArgumentNullException(nameof(connectionStringOptions));
+        _options = connectionStringsOptions.Value;
+        _entityConfigurationFactory = entityConfigurationFactory;
+        _jsonSerializerOptions = jsonSerializerOptions.Value;
     }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -130,15 +143,18 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         if (!optionsBuilder.IsConfigured)
         {
-            optionsBuilder.ReplaceService<IModelCacheKeyFactory, TenantModelCacheKeyFactory>();
+            var dataSource = new NpgsqlDataSourceBuilder(IsReadOnly && !string.IsNullOrEmpty(_options.Replica) ? _options.Replica : _options.Main)
+                .EnableDynamicJsonMappings(_jsonSerializerOptions)
+                .Build();
 
             optionsBuilder
-                .UseNpgsql(IsReadOnly && !string.IsNullOrEmpty(_options.Replica) ? _options.Replica : _options.Main, opt =>
+                .ReplaceService<IModelCacheKeyFactory, TenantModelCacheKeyFactory>()
+                .UseNpgsql(dataSource, opt =>
                 {
-                    opt.EnableRetryOnFailure();
+                    opt.EnableRetryOnFailure(50, TimeSpan.FromSeconds(5), null);
                     opt.MigrationsHistoryTable("ef_migrations_history", "ef");
                 })
-                .AddPrepareInterceptor()
+                //.AddPrepareInterceptor()
                 .EnableSensitiveDataLogging()
                 /*.UseLoggerFactory(LoggerFactory.Create(b => b.AddFilter(level => level >= LogLevel.Information)))*/;
         }
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfiguration.cs
index e6b0b1f4..42444392 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfiguration.cs
@@ -5,8 +5,8 @@
 
 namespace BUTR.Site.NexusMods.Server.Contexts.Configs;
 
-public abstract class BaseEntityConfiguration<TEntity> : IEntityTypeConfiguration<TEntity> where TEntity : class, IEntity
+public abstract class BaseEntityConfiguration<TEntity> where TEntity : class, IEntity
 {
-    public void Configure(EntityTypeBuilder<TEntity> builder) => ConfigureModel(builder);
+    public virtual void Configure(ModelBuilder builder) => ConfigureModel(builder.Entity<TEntity>());
     protected virtual void ConfigureModel(EntityTypeBuilder<TEntity> builder) { }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfigurationWithTenant.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfigurationWithTenant.cs
index a213b4c2..bdc99eac 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfigurationWithTenant.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfigurationWithTenant.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -19,7 +19,7 @@ protected BaseEntityConfigurationWithTenant(ITenantContextAccessor tenantContext
 
     protected override void ConfigureModel(EntityTypeBuilder<TEntity> builder)
     {
-        builder.Property(x => x.TenantId).HasColumnName("tenant").HasConversion<TenantId.EfCoreValueConverter>();
+        builder.Property(x => x.TenantId).HasColumnName("tenant").HasVogenConversion();
         builder.HasQueryFilter(x => x.TenantId.Equals(_tenantContextAccessor.Current));
 
         builder.HasOne<TenantEntity>()
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportEntityConfiguration.cs
index b44c83f2..bf07e22f 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,13 +13,13 @@ public CrashReportEntityConfiguration(ITenantContextAccessor tenantContextAccess
 
     protected override void ConfigureModel(EntityTypeBuilder<CrashReportEntity> builder)
     {
-        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_id").HasConversion<CrashReportId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property(x => x.Version).HasColumnName("version").HasConversion<CrashReportVersion.EfCoreValueConverter>();
-        builder.Property(x => x.GameVersion).HasColumnName("game_version").HasConversion<GameVersion.EfCoreValueConverter>();
-        builder.Property<ExceptionTypeId>(nameof(ExceptionTypeEntity.ExceptionTypeId)).HasColumnName("exception_type_id").HasConversion<ExceptionTypeId.EfCoreValueConverter>();
+        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.Version).HasColumnName("version").HasVogenConversion();
+        builder.Property(x => x.GameVersion).HasColumnName("game_version").HasVogenConversion();
+        builder.Property<ExceptionTypeId>(nameof(ExceptionTypeEntity.ExceptionTypeId)).HasColumnName("exception_type_id").HasVogenConversion();
         builder.Property(x => x.Exception).HasColumnName("exception");
         builder.Property(x => x.CreatedAt).HasColumnName("created_at");
-        builder.Property(x => x.Url).HasColumnName("url").HasConversion<CrashReportUrl.EfCoreValueConverter>();
+        builder.Property(x => x.Url).HasColumnName("url").HasVogenConversion();
         builder.ToTable("crash_report", "crashreport").HasKey(x => new { x.TenantId, x.CrashReportId });
 
         builder.HasOne(x => x.ExceptionType)
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportIgnoredFileIdEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportIgnoredFileIdEntityConfiguration.cs
index db9f86b9..f312e0a9 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportIgnoredFileIdEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportIgnoredFileIdEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +12,7 @@ public CrashReportIgnoredFileIdEntityConfiguration(ITenantContextAccessor tenant
 
     protected override void ConfigureModel(EntityTypeBuilder<CrashReportIgnoredFileEntity> builder)
     {
-        builder.Property(x => x.Value).HasColumnName("crash_report_file_ignored_id").HasConversion<CrashReportFileId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property(x => x.Value).HasColumnName("crash_report_file_ignored_id").HasVogenConversion().ValueGeneratedNever();
         builder.ToTable("crash_report_file_ignored", "crashreport").HasKey(x => new { x.TenantId, x.Value });
 
         base.ConfigureModel(builder);
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToFileIdEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToFileIdEntityConfiguration.cs
index 17e59fa0..51a8b1c1 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToFileIdEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToFileIdEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,8 +12,8 @@ public CrashReportToFileIdEntityConfiguration(ITenantContextAccessor tenantConte
 
     protected override void ConfigureModel(EntityTypeBuilder<CrashReportToFileIdEntity> builder)
     {
-        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_file_id").HasConversion<CrashReportId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property(x => x.FileId).HasColumnName("file_id").HasConversion<CrashReportFileId.EfCoreValueConverter>();
+        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_file_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.FileId).HasColumnName("file_id").HasVogenConversion();
         builder.ToTable("crash_report_file", "crashreport").HasKey(x => new { x.TenantId, x.CrashReportId });
 
         builder.HasOne(x => x.ToCrashReport)
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToMetadataEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToMetadataEntityConfiguration.cs
index d3b6eeed..5f706f96 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToMetadataEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToMetadataEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +12,7 @@ public CrashReportToMetadataEntityConfiguration(ITenantContextAccessor tenantCon
 
     protected override void ConfigureModel(EntityTypeBuilder<CrashReportToMetadataEntity> builder)
     {
-        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_metadata_id").HasConversion<CrashReportId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_metadata_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.LauncherType).HasColumnName("launcher_type");
         builder.Property(x => x.LauncherVersion).HasColumnName("launcher_version");
         builder.Property(x => x.Runtime).HasColumnName("runtime");
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToModuleMetadataEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToModuleMetadataEntityConfiguration.cs
index a9016052..61934886 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToModuleMetadataEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToModuleMetadataEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,10 +13,10 @@ public CrashReportToModuleMetadataEntityConfiguration(ITenantContextAccessor ten
 
     protected override void ConfigureModel(EntityTypeBuilder<CrashReportToModuleMetadataEntity> builder)
     {
-        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_module_info_id").HasConversion<CrashReportId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasConversion<ModuleId.EfCoreValueConverter>();
-        builder.Property(x => x.Version).HasConversion<ModuleVersion.EfCoreValueConverter>().HasColumnName("version");
-        builder.Property<NexusModsModId?>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_id").HasConversion<NexusModsModId.EfCoreValueConverter>().IsRequired(false);
+        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_module_info_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasVogenConversion();
+        builder.Property(x => x.Version).HasVogenConversion().HasColumnName("version");
+        builder.Property<NexusModsModId?>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_id").HasVogenConversion().IsRequired(false);
         builder.Property(x => x.IsInvolved).HasColumnName("is_involved");
         builder.ToTable("crash_report_module_info", "crashreport").HasKey(nameof(CrashReportToModuleMetadataEntity.TenantId), nameof(CrashReportToModuleMetadataEntity.CrashReportId), nameof(ModuleEntity.ModuleId));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/ExceptionTypeEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/ExceptionTypeEntityConfiguration.cs
index a8006e76..66a04b0c 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/ExceptionTypeEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/ExceptionTypeEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +12,7 @@ public ExceptionTypeEntityConfiguration(ITenantContextAccessor tenantContextAcce
 
     protected override void ConfigureModel(EntityTypeBuilder<ExceptionTypeEntity> builder)
     {
-        builder.Property(x => x.ExceptionTypeId).HasColumnName("exception_type_id").HasConversion<ExceptionTypeId.EfCoreValueConverter>();
+        builder.Property(x => x.ExceptionTypeId).HasColumnName("exception_type_id").HasVogenConversion();
         builder.ToTable("exception_type", "exception").HasKey(x => new { x.TenantId, x.ExceptionTypeId });
 
         base.ConfigureModel(builder);
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationDiscordTokensEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationDiscordTokensEntityConfiguration.cs
index 738308ae..70a475fe 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationDiscordTokensEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationDiscordTokensEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +11,7 @@ public class IntegrationDiscordTokensEntityConfiguration : BaseEntityConfigurati
 {
     protected override void ConfigureModel(EntityTypeBuilder<IntegrationDiscordTokensEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_discord_tokens_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_discord_tokens_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.DiscordUserId).HasColumnName("discord_user_id");
         builder.Property(x => x.RefreshToken).HasColumnName("refresh_token");
         builder.Property(x => x.AccessToken).HasColumnName("access_token");
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGToOwnedTenantEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGToOwnedTenantEntityConfiguration.cs
index 1c43b9eb..72bac22f 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGToOwnedTenantEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGToOwnedTenantEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -11,7 +11,7 @@ public class IntegrationGOGToOwnedTenantEntityConfiguration : BaseEntityConfigur
     protected override void ConfigureModel(EntityTypeBuilder<IntegrationGOGToOwnedTenantEntity> builder)
     {
         builder.Property(x => x.GOGUserId).HasColumnName("integration_gog_owned_tenant_id");
-        builder.Property(x => x.OwnedTenant).HasColumnName("owned_tenant").HasConversion<TenantId.EfCoreValueConverter>();
+        builder.Property(x => x.OwnedTenant).HasColumnName("owned_tenant").HasVogenConversion();
         builder.ToTable("integration_gog_owned_tenant", "integration").HasKey(x => new { x.GOGUserId, x.OwnedTenant });
 
         builder.HasOne<NexusModsUserToIntegrationGOGEntity>()
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGTokensEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGTokensEntityConfiguration.cs
index 1a5ac836..90c0b740 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGTokensEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGTokensEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +11,7 @@ public class IntegrationGOGTokensEntityConfiguration : BaseEntityConfiguration<I
 {
     protected override void ConfigureModel(EntityTypeBuilder<IntegrationGOGTokensEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_gog_tokens_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_gog_tokens_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.GOGUserId).HasColumnName("gog_user_id");
         builder.Property(x => x.RefreshToken).HasColumnName("refresh_token");
         builder.Property(x => x.AccessToken).HasColumnName("access_token");
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamToOwnedTenantEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamToOwnedTenantEntityConfiguration.cs
index ad91ff27..c1bbe7d8 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamToOwnedTenantEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamToOwnedTenantEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -11,7 +11,7 @@ public class IntegrationSteamToOwnedTenantEntityConfiguration : BaseEntityConfig
     protected override void ConfigureModel(EntityTypeBuilder<IntegrationSteamToOwnedTenantEntity> builder)
     {
         builder.Property(x => x.SteamUserId).HasColumnName("integration_steam_owned_tenant_id");
-        builder.Property(x => x.OwnedTenant).HasColumnName("owned_tenant").HasConversion<TenantId.EfCoreValueConverter>();
+        builder.Property(x => x.OwnedTenant).HasColumnName("owned_tenant").HasVogenConversion();
         builder.ToTable("integration_steam_owned_tenant", "integration").HasKey(x => new { x.SteamUserId, x.OwnedTenant });
 
         builder.HasOne<NexusModsUserToIntegrationSteamEntity>()
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamTokensEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamTokensEntityConfiguration.cs
index 788e2a05..b1d55dde 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamTokensEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamTokensEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +11,7 @@ public sealed class IntegrationSteamTokensEntityConfiguration : BaseEntityConfig
 {
     protected override void ConfigureModel(EntityTypeBuilder<IntegrationSteamTokensEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_steam_tokens_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_steam_tokens_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.SteamUserId).HasColumnName("steam_user_id");
         builder.Property(x => x.Data).HasColumnName("data").HasColumnType("hstore");
         builder.ToTable("integration_steam_tokens", "integration").HasKey(nameof(NexusModsUserEntity.NexusModsUserId));
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/ModuleEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/ModuleEntityConfiguration.cs
index 2a9337c1..3a47cfbc 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/ModuleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/ModuleEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +12,7 @@ public ModuleEntityConfiguration(ITenantContextAccessor tenantContextAccessor) :
 
     protected override void ConfigureModel(EntityTypeBuilder<ModuleEntity> builder)
     {
-        builder.Property(x => x.ModuleId).HasColumnName("module_id").HasConversion<ModuleId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property(x => x.ModuleId).HasColumnName("module_id").HasVogenConversion().ValueGeneratedNever();
         builder.ToTable("module", "module").HasKey(x => new { x.TenantId, x.ModuleId });
 
         base.ConfigureModel(builder);
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsArticleEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsArticleEntityConfiguration.cs
index 8d671b04..25970ef5 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsArticleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsArticleEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,9 +13,9 @@ public NexusModsArticleEntityConfiguration(ITenantContextAccessor tenantContextA
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsArticleEntity> builder)
     {
-        builder.Property(x => x.NexusModsArticleId).HasColumnName("nexusmods_article_entity_id").HasConversion<NexusModsArticleId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property(x => x.NexusModsArticleId).HasColumnName("nexusmods_article_entity_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.Title).HasColumnName("title");
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("author_id").HasConversion<NexusModsUserId.EfCoreValueConverter>();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("author_id").HasVogenConversion();
         builder.Property(x => x.CreateDate).HasColumnName("create_date");
         builder.ToTable("nexusmods_article_entity", "nexusmods_article").HasKey(x => new { x.TenantId, x.NexusModsArticleId });
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModEntityConfiguration.cs
index 83cc4df0..3d5d5146 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +12,7 @@ public NexusModsModEntityConfiguration(ITenantContextAccessor tenantContextAcces
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModEntity> builder)
     {
-        builder.Property(x => x.NexusModsModId).HasColumnName("nexusmods_mod_id").HasConversion<NexusModsModId.EfCoreValueConverter>();
+        builder.Property(x => x.NexusModsModId).HasColumnName("nexusmods_mod_id").HasVogenConversion();
         builder.ToTable("nexusmods_mod", "nexusmods_mod").HasKey(x => new { x.TenantId, x.NexusModsModId });
 
         base.ConfigureModel(builder);
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToFileUpdateEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToFileUpdateEntityConfiguration.cs
index 37429170..ffc1a0c1 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToFileUpdateEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToFileUpdateEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +13,7 @@ public NexusModsModToFileUpdateEntityConfiguration(ITenantContextAccessor tenant
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModToFileUpdateEntity> builder)
     {
-        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_file_update_id").HasConversion<NexusModsModId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_file_update_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.LastCheckedDate).HasColumnName("date_of_last_check");
         builder.ToTable("nexusmods_mod_file_update", "nexusmods_mod").HasKey(nameof(NexusModsModToFileUpdateEntity.TenantId), nameof(NexusModsModEntity.NexusModsModId));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleEntityConfiguration.cs
index 3ced0b27..23225cc5 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,8 +13,8 @@ public NexusModsModToModuleEntityConfiguration(ITenantContextAccessor tenantCont
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModToModuleEntity> builder)
     {
-        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_module_id").HasConversion<NexusModsModId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasConversion<ModuleId.EfCoreValueConverter>();
+        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_module_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasVogenConversion();
         builder.Property(x => x.LinkType).HasColumnName("nexusmods_mod_module_link_type_id");
         builder.Property(x => x.LastUpdateDate).HasColumnName("date_of_last_update");
         builder.ToTable("nexusmods_mod_module", "nexusmods_mod").HasKey(nameof(NexusModsModToModuleEntity.TenantId), nameof(NexusModsModEntity.NexusModsModId), nameof(ModuleEntity.ModuleId), nameof(NexusModsModToModuleEntity.LinkType));
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleInfoHistoryEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleInfoHistoryEntityConfiguration.cs
index 25d9cfc7..03ae0da2 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleInfoHistoryEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleInfoHistoryEntityConfiguration.cs
@@ -1,3 +1,4 @@
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -12,10 +13,10 @@ public NexusModsModToModuleInfoHistoryEntityConfiguration(ITenantContextAccessor
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModToModuleInfoHistoryEntity> builder)
     {
-        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_name_id").HasConversion<NexusModsModId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property(x => x.NexusModsFileId).HasColumnName("nexusmods_file_id").HasConversion<NexusModsFileId.EfCoreValueConverter>();
-        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasConversion<ModuleId.EfCoreValueConverter>();
-        builder.Property(x => x.ModuleVersion).HasColumnName("module_version").HasConversion<ModuleVersion.EfCoreValueConverter>();
+        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_module_info_history_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.NexusModsFileId).HasColumnName("nexusmods_file_id").HasVogenConversion();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasVogenConversion();
+        builder.Property(x => x.ModuleVersion).HasColumnName("module_version").HasVogenConversion();
         builder.Property(x => x.ModuleInfo).HasColumnName("module_info").HasColumnType("jsonb");
         builder.Property(x => x.UploadDate).HasColumnName("date_of_upload");
         builder.ToTable("nexusmods_mod_module_info_history", "nexusmods_mod").HasKey(nameof(NexusModsModToModuleInfoHistoryEntity.TenantId), nameof(NexusModsModToModuleInfoHistoryEntity.NexusModsFileId), nameof(NexusModsModEntity.NexusModsModId), nameof(ModuleEntity.ModuleId), nameof(NexusModsModToModuleInfoHistoryEntity.ModuleVersion));
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToNameEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToNameEntityConfiguration.cs
index a330a043..16de0212 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToNameEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToNameEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +13,7 @@ public NexusModsModToNameEntityConfiguration(ITenantContextAccessor tenantContex
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModToNameEntity> builder)
     {
-        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_name_id").HasConversion<NexusModsModId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_name_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.Name).HasColumnName("name");
         builder.ToTable("nexusmods_mod_name", "nexusmods_mod").HasKey(nameof(NexusModsModToNameEntity.TenantId), nameof(NexusModsModEntity.NexusModsModId));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserEntityConfiguration.cs
index 13e274a2..c57bd499 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +10,7 @@ public class NexusModsUserEntityConfiguration : BaseEntityConfiguration<NexusMod
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserEntity> builder)
     {
-        builder.Property(x => x.NexusModsUserId).HasColumnName("nexusmods_user_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property(x => x.NexusModsUserId).HasColumnName("nexusmods_user_id").HasVogenConversion().ValueGeneratedNever();
         builder.ToTable("nexusmods_user", "nexusmods_user").HasKey(x => x.NexusModsUserId);
 
         base.ConfigureModel(builder);
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToCrashReportEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToCrashReportEntityConfiguration.cs
index 6809927a..b13b41b0 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToCrashReportEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToCrashReportEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,8 +13,8 @@ public NexusModsUserToCrashReportEntityConfiguration(ITenantContextAccessor tena
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToCrashReportEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_crash_report_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_id").HasConversion<CrashReportId.EfCoreValueConverter>();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_crash_report_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_id").HasVogenConversion();
         builder.Property(x => x.Status).HasColumnName("status");
         builder.Property(x => x.Comment).HasColumnName("comment");
         builder.ToTable("nexusmods_user_crash_report", "nexusmods_user").HasKey(nameof(NexusModsUserToCrashReportEntity.TenantId), nameof(NexusModsUserEntity.NexusModsUserId), nameof(NexusModsUserToCrashReportEntity.CrashReportId));
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationDiscordEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationDiscordEntityConfiguration.cs
index 89a6b974..8dcb4fdb 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationDiscordEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationDiscordEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +11,7 @@ public class NexusModsUserToIntegrationDiscordEntityConfiguration : BaseEntityCo
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToIntegrationDiscordEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_discord_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_discord_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.DiscordUserId).HasColumnName("discord_user_id");
         builder.ToTable("nexusmods_user_to_integration_discord", "nexusmods_user").HasKey(nameof(NexusModsUserEntity.NexusModsUserId));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationGOGEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationGOGEntityConfiguration.cs
index f218f90e..4b0b01ce 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationGOGEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationGOGEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +11,7 @@ public class NexusModsUserToIntegrationGOGEntityConfiguration : BaseEntityConfig
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToIntegrationGOGEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_gog_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_gog_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.GOGUserId).HasColumnName("gog_user_id");
         builder.ToTable("nexusmods_user_to_integration_gog", "nexusmods_user").HasKey(nameof(NexusModsUserEntity.NexusModsUserId));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationSteamEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationSteamEntityConfiguration.cs
index 72540584..5bf98a45 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationSteamEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationSteamEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +11,7 @@ public class NexusModsUserToIntegrationSteamEntityConfiguration : BaseEntityConf
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToIntegrationSteamEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_steam_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_steam_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.SteamUserId).HasColumnName("steam_user_id");
         builder.ToTable("nexusmods_user_to_integration_steam", "nexusmods_user").HasKey(nameof(NexusModsUserEntity.NexusModsUserId));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToModuleEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToModuleEntityConfiguration.cs
index d079ce1b..4fe03090 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToModuleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToModuleEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,8 +13,8 @@ public NexusModsUserToModuleEntityConfiguration(ITenantContextAccessor tenantCon
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToModuleEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_module_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasConversion<ModuleId.EfCoreValueConverter>();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_module_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasVogenConversion();
         builder.Property(x => x.LinkType).HasColumnName("nexusmods_user_module_link_type_id");
         builder.ToTable("nexusmods_user_module", "nexusmods_user").HasKey(nameof(NexusModsUserToModuleEntity.TenantId), nameof(NexusModsUserEntity.NexusModsUserId), nameof(ModuleEntity.ModuleId), nameof(NexusModsUserToModuleEntity.LinkType));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNameEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNameEntityConfiguration.cs
index 5105894c..9ec77358 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNameEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNameEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,8 +11,8 @@ public class NexusModsUserToNameEntityConfiguration : BaseEntityConfiguration<Ne
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToNameEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_name_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property(x => x.Name).HasColumnName("name").HasConversion<NexusModsUserName.EfCoreValueConverter>();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_name_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.Name).HasColumnName("name").HasVogenConversion();
         builder.ToTable("nexusmods_user_name", "nexusmods_user").HasKey(nameof(NexusModsUserEntity.NexusModsUserId));
 
         builder.HasOne(x => x.NexusModsUser)
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNexusModsModEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNexusModsModEntityConfiguration.cs
index 7d2368a1..deb8e25a 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNexusModsModEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNexusModsModEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,8 +13,8 @@ public NexusModsUserToNexusModsModEntityConfiguration(ITenantContextAccessor ten
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToNexusModsModEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_nexusmods_mod_id").HasConversion<NexusModsUserId.EfCoreValueConverter>();
-        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_id").HasConversion<NexusModsModId.EfCoreValueConverter>();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_nexusmods_mod_id").HasVogenConversion();
+        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_id").HasVogenConversion();
         builder.Property(x => x.LinkType).HasColumnName("nexusmods_user_nexusmods_mod_link_type_id");
         builder.ToTable("nexusmods_user_nexusmods_mod", "nexusmods_user").HasKey(nameof(NexusModsUserToNexusModsModEntity.TenantId), nameof(NexusModsUserEntity.NexusModsUserId), nameof(NexusModsModEntity.NexusModsModId), nameof(NexusModsUserToNexusModsModEntity.LinkType));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToRoleEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToRoleEntityConfiguration.cs
index c46cbeab..92b6041c 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToRoleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToRoleEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,9 +13,9 @@ public NexusModsUserToRoleEntityConfiguration(ITenantContextAccessor tenantConte
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToRoleEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_role_id").HasConversion<NexusModsUserId.EfCoreValueConverter>().ValueGeneratedNever();
-        builder.Property(x => x.Role).HasColumnName("role").HasConversion<ApplicationRole.EfCoreValueConverter>();
-        builder.Property(x => x.TenantId).HasColumnName("tenant").HasConversion<TenantId.EfCoreValueConverter>();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_role_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.Role).HasColumnName("role").HasVogenConversion();
+        builder.Property(x => x.TenantId).HasColumnName("tenant").HasVogenConversion();
         builder.ToTable("nexusmods_user_role", "nexusmods_user").HasKey(nameof(NexusModsUserToRoleEntity.TenantId), nameof(NexusModsUserEntity.NexusModsUserId));
 
         builder.HasOne(x => x.NexusModsUser)
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/QuartzExecutionLogEntryConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/QuartzExecutionLogEntryConfiguration.cs
index 62358dda..5a40afac 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/QuartzExecutionLogEntryConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/QuartzExecutionLogEntryConfiguration.cs
@@ -7,46 +7,43 @@ namespace BUTR.Site.NexusMods.Server.Contexts.Configs;
 
 public class QuartzExecutionLogEntityConfiguration : BaseEntityConfiguration<QuartzExecutionLogEntity>
 {
-    protected override void ConfigureModel(EntityTypeBuilder<QuartzExecutionLogEntity> builder)
+    public override void Configure(ModelBuilder builder)
     {
-        builder.Property(x => x.LogId).HasColumnName("quartz_execution_log_id").ValueGeneratedOnAdd();
-
-        builder.Property(x => x.RunInstanceId).HasColumnName("run_instance_id");
+        builder.HasSequence<int>("quartz_log_id_seq", "quartz")
+            .StartsAt(1)
+            .IncrementsBy(1);
 
-        builder.Property(x => x.LogType).HasColumnName("log_type").HasConversion<string>().HasMaxLength(20);
+        base.Configure(builder);
+    }
 
+    protected override void ConfigureModel(EntityTypeBuilder<QuartzExecutionLogEntity> builder)
+    {
+        builder.Property(x => x.LogId).HasColumnName("quartz_log_id").HasDefaultValueSql("nextval('\"quartz\".\"quartz_log_id_seq\"')");
+        builder.Property(x => x.RunInstanceId).HasColumnName("run_instance_id");
         builder.Property(x => x.JobName).HasColumnName("job_name").HasMaxLength(256);
         builder.Property(x => x.JobGroup).HasColumnName("job_group").HasMaxLength(256);
         builder.Property(x => x.TriggerName).HasColumnName("trigger_name").HasMaxLength(256);
         builder.Property(x => x.TriggerGroup).HasColumnName("trigger_group").HasMaxLength(256);
-
-        builder.Property(x => x.ScheduleFireTimeUtc).HasColumnName("_schedule_fire_time_utc");
         builder.Property(x => x.FireTimeUtc).HasColumnName("fire_time_utc");
-
         builder.Property(x => x.JobRunTime).HasColumnName("job_run_time");
 
-        builder.Property(x => x.RetryCount).HasColumnName("retry_count");
-
-        builder.Property(x => x.Result).HasColumnName("result");
+        builder.Property(x => x.ScheduleFireTimeUtc).HasColumnName("schedule_fire_time_utc");
 
-        builder.Property(x => x.ErrorMessage).HasColumnName("error_message");
+        builder.Property(x => x.RetryCount).HasColumnName("retry_count");
 
-        builder.Property(x => x.IsVetoed).HasColumnName("is_vetoed");
-        builder.Property(x => x.IsException).HasColumnName("is_exception");
         builder.Property(x => x.IsSuccess).HasColumnName("is_success");
+        builder.Property(x => x.IsException).HasColumnName("is_exception");
+        builder.Property(x => x.IsVetoed).HasColumnName("is_vetoed");
 
+        builder.Property(x => x.ErrorMessage).HasColumnName("error_message");
+        builder.Property(x => x.ExecutionLogDetail).HasColumnName("log_detail").HasColumnType("jsonb");
+        builder.Property(x => x.Result).HasColumnName("result");
         builder.Property(x => x.ReturnCode).HasColumnName("return_code");
 
         builder.Property(x => x.DateAddedUtc).HasColumnName("date_added_utc");
-        builder.Property(x => x.ExecutionLogDetail).HasColumnName("execution_log_detail").HasColumnType("jsonb");
-
         builder.Property(x => x.MachineName).HasColumnName("machie_name");
 
-        builder.ToTable("quartz_execution_log", "quartz").HasKey(x => x.LogId);
-
-        builder.HasIndex(x => x.RunInstanceId);
-        builder.HasIndex(x => new { x.DateAddedUtc, x.LogType });
-        builder.HasIndex(x => new { x.TriggerName, x.TriggerGroup, x.JobName, x.JobGroup, x.DateAddedUtc });
+        builder.ToTable("quartz_log", "quartz").HasKey(x => new { x.RunInstanceId, x.JobName, x.JobGroup, x.TriggerName, x.TriggerGroup, x.FireTimeUtc });
 
         base.ConfigureModel(builder);
     }
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsCrashScoreInvolvedEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsCrashScoreInvolvedEntityConfiguration.cs
index a8f5a970..ea3f32b0 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsCrashScoreInvolvedEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsCrashScoreInvolvedEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -13,9 +14,9 @@ public StatisticsCrashScoreInvolvedEntityConfiguration(ITenantContextAccessor te
     protected override void ConfigureModel(EntityTypeBuilder<StatisticsCrashScoreInvolvedEntity> builder)
     {
         builder.Property(x => x.StatisticsCrashScoreInvolvedId).HasColumnName("crash_score_involved_id");
-        builder.Property(x => x.GameVersion).HasColumnName("game_version").HasConversion<GameVersion.EfCoreValueConverter>();
-        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasConversion<ModuleId.EfCoreValueConverter>();
-        builder.Property(x => x.ModuleVersion).HasColumnName("module_version").HasConversion<ModuleVersion.EfCoreValueConverter>();
+        builder.Property(x => x.GameVersion).HasColumnName("game_version").HasVogenConversion();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasVogenConversion();
+        builder.Property(x => x.ModuleVersion).HasColumnName("module_version").HasVogenConversion();
         builder.Property(x => x.InvolvedCount).HasColumnName("involved_count");
         builder.Property(x => x.NotInvolvedCount).HasColumnName("not_involved_count");
         builder.Property(x => x.TotalCount).HasColumnName("total_count");
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsTopExceptionsTypeEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsTopExceptionsTypeEntityConfiguration.cs
index 699e54df..ac112e0e 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsTopExceptionsTypeEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsTopExceptionsTypeEntityConfiguration.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +13,7 @@ public StatisticsTopExceptionsTypeEntityConfiguration(ITenantContextAccessor ten
 
     protected override void ConfigureModel(EntityTypeBuilder<StatisticsTopExceptionsTypeEntity> builder)
     {
-        builder.Property<ExceptionTypeId>(nameof(ExceptionTypeEntity.ExceptionTypeId)).HasColumnName("top_exceptions_type_id").HasConversion<ExceptionTypeId.EfCoreValueConverter>().ValueGeneratedNever();
+        builder.Property<ExceptionTypeId>(nameof(ExceptionTypeEntity.ExceptionTypeId)).HasColumnName("top_exceptions_type_id").HasVogenConversion().ValueGeneratedNever();
         builder.Property(x => x.ExceptionCount).HasColumnName("count");
         builder.ToTable("top_exceptions_type", "statistics").HasKey(nameof(StatisticsTopExceptionsTypeEntity.TenantId), nameof(ExceptionTypeEntity.ExceptionTypeId));
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/TenantEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/TenantEntityConfiguration.cs
index 8ec2f2f3..84d23abc 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/TenantEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/TenantEntityConfiguration.cs
@@ -1,4 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
@@ -10,7 +10,7 @@ public class TenantEntityConfiguration : BaseEntityConfiguration<TenantEntity>
 {
     protected override void ConfigureModel(EntityTypeBuilder<TenantEntity> builder)
     {
-        builder.Property(x => x.TenantId).HasColumnName("tenant_id").HasConversion<TenantId.EfCoreValueConverter>();
+        builder.Property(x => x.TenantId).HasColumnName("tenant_id").HasVogenConversion();
         builder.ToTable("tenant", "tenant").HasKey(x => x.TenantId);
 
         base.ConfigureModel(builder);
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/EntityConfigurationFactory.cs b/src/BUTR.Site.NexusMods.Server/Contexts/EntityConfigurationFactory.cs
index ef8ad065..0531bc56 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/EntityConfigurationFactory.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/EntityConfigurationFactory.cs
@@ -20,12 +20,12 @@ public EntityConfigurationFactory(IServiceProvider serviceProvider)
     public void ApplyConfiguration<TEntity>(ModelBuilder modelBuilder) where TEntity : class, IEntity
     {
         var configuration = _serviceProvider.GetRequiredService<BaseEntityConfiguration<TEntity>>();
-        configuration.Configure(modelBuilder.Entity<TEntity>());
+        configuration.Configure(modelBuilder);
     }
 
     public void ApplyConfigurationWithTenant<TEntity>(ModelBuilder modelBuilder) where TEntity : class, IEntityWithTenant
     {
         var configuration = _serviceProvider.GetRequiredService<BaseEntityConfigurationWithTenant<TEntity>>();
-        configuration.Configure(modelBuilder.Entity<TEntity>());
+        configuration.Configure(modelBuilder);
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/EntityFactory.cs b/src/BUTR.Site.NexusMods.Server/Contexts/EntityFactory.cs
index 6f8c2e8a..ad2bd946 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/EntityFactory.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/EntityFactory.cs
@@ -1,4 +1,5 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using System;
@@ -158,23 +159,32 @@ public ExceptionTypeEntity GetOrCreateExceptionTypeFromException(string exceptio
         static ExceptionTypeEntity ValueFactory(ExceptionTypeId id, TenantId tenant) => ExceptionTypeEntity.Create(tenant, id);
     }
 
-    public async Task SaveCreatedAsync(CancellationToken ct)
+    public async Task<bool> SaveCreatedAsync(CancellationToken ct)
     {
         await _lock.WaitAsync(ct);
 
         try
         {
-            if (!_nexusModsUsers.IsEmpty) await _dbContextWrite.NexusModsUsers.BulkMergeAsync(_nexusModsUsers.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_nexusModsUserNames.IsEmpty) await _dbContextWrite.NexusModsUserToName.BulkMergeAsync(_nexusModsUserNames.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_nexusModsMods.IsEmpty) await _dbContextWrite.NexusModsMods.BulkMergeAsync(_nexusModsMods.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_modules.IsEmpty) await _dbContextWrite.Modules.BulkMergeAsync(_modules.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_exceptionTypes.IsEmpty) await _dbContextWrite.ExceptionTypes.BulkMergeAsync(_exceptionTypes.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_discordUsers.IsEmpty) await _dbContextWrite.NexusModsUserToDiscord.BulkMergeAsync(_discordUsers.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_steamUsers.IsEmpty) await _dbContextWrite.NexusModsUserToSteam.BulkMergeAsync(_steamUsers.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_gogUsers.IsEmpty) await _dbContextWrite.NexusModsUserToGOG.BulkMergeAsync(_gogUsers.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_discordTokens.IsEmpty) await _dbContextWrite.IntegrationDiscordTokens.BulkMergeAsync(_discordTokens.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_gogTokens.IsEmpty) await _dbContextWrite.IntegrationGOGTokens.BulkMergeAsync(_gogTokens.Values, o => o.UseInternalTransaction = false, ct);
-            if (!_steamTokens.IsEmpty) await _dbContextWrite.IntegrationSteamTokens.BulkMergeAsync(_steamTokens.Values, o => o.UseInternalTransaction = false, ct);
+            var hasChange = false;
+            async Task DoChange(Func<Task> action)
+            {
+                hasChange = true;
+                await action();
+            }
+
+            if (!_nexusModsUsers.IsEmpty) await DoChange(() => _dbContextWrite.NexusModsUsers.UpsertAsync(_nexusModsUsers.Values));
+            if (!_nexusModsUserNames.IsEmpty) await DoChange(() => _dbContextWrite.NexusModsUserToName.UpsertAsync(_nexusModsUserNames.Values));
+            if (!_nexusModsMods.IsEmpty) await DoChange(() => _dbContextWrite.NexusModsMods.UpsertAsync(_nexusModsMods.Values));
+            if (!_modules.IsEmpty) await DoChange(() => _dbContextWrite.Modules.UpsertAsync(_modules.Values));
+            if (!_exceptionTypes.IsEmpty) await DoChange(() => _dbContextWrite.ExceptionTypes.UpsertAsync(_exceptionTypes.Values));
+            if (!_discordUsers.IsEmpty) await DoChange(() => _dbContextWrite.NexusModsUserToDiscord.UpsertAsync(_discordUsers.Values));
+            if (!_steamUsers.IsEmpty) await DoChange(() => _dbContextWrite.NexusModsUserToSteam.UpsertAsync(_steamUsers.Values));
+            if (!_gogUsers.IsEmpty) await DoChange(() => _dbContextWrite.NexusModsUserToGOG.UpsertAsync(_gogUsers.Values));
+            if (!_discordTokens.IsEmpty) await DoChange(() => _dbContextWrite.IntegrationDiscordTokens.UpsertAsync(_discordTokens.Values));
+            if (!_gogTokens.IsEmpty) await DoChange(() => _dbContextWrite.IntegrationGOGTokens.UpsertAsync(_gogTokens.Values));
+            if (!_steamTokens.IsEmpty) await DoChange(() => _dbContextWrite.IntegrationSteamTokens.UpsertAsync(_steamTokens.Values));
+
+            return hasChange;
         }
         finally
         {
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/IAppDbContextSaveScope.cs b/src/BUTR.Site.NexusMods.Server/Contexts/IAppDbContextSaveScope.cs
new file mode 100644
index 00000000..db983e74
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/IAppDbContextSaveScope.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Contexts;
+
+public interface IAppDbContextSaveScope : IAsyncDisposable
+{
+    Task CancelAsync();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/IAppDbContextWrite.cs b/src/BUTR.Site.NexusMods.Server/Contexts/IAppDbContextWrite.cs
index f2c722e9..d3226496 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/IAppDbContextWrite.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/IAppDbContextWrite.cs
@@ -2,9 +2,7 @@
 
 using Microsoft.EntityFrameworkCore;
 
-using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace BUTR.Site.NexusMods.Server.Contexts;
@@ -13,11 +11,11 @@ public interface IAppDbContextWrite : IAppDbContextRead
 {
     EntityFactory GetEntityFactory();
     
-    IAsyncDisposable CreateSaveScope();
+    Task<IAppDbContextSaveScope> CreateSaveScopeAsync();
 
-    void FutureUpsert<TEntity>(Func<IAppDbContextWrite, DbSet<TEntity>> dbset, TEntity entity) where TEntity : class, IEntity;
-    void FutureUpsert<TEntity>(Func<IAppDbContextWrite, DbSet<TEntity>> dbset, ICollection<TEntity> entities) where TEntity : class, IEntity;
-    void FutureSyncronize<TEntity>(Func<IAppDbContextWrite, DbSet<TEntity>> dbset, ICollection<TEntity> entities) where TEntity : class, IEntity;
+    Task BulkUpsertAsync<TEntity>(DbSet<TEntity> dbSet, IEnumerable<TEntity> entities) where TEntity : class, IEntity;
+    Task BulkSynchronizeAsync<TEntity>(DbSet<TEntity> dbSet, IEnumerable<TEntity> entities) where TEntity : class, IEntity;
 
-    Task SaveAsync(CancellationToken ct = default);
+    Task BulkUpsertAsync<TEntity>(DbSet<TEntity> dbSet, IAsyncEnumerable<TEntity> entities) where TEntity : class, IEntity;
+    Task BulkSynchronizeAsync<TEntity>(DbSet<TEntity> dbSet, IAsyncEnumerable<TEntity> entities) where TEntity : class, IEntity;
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/AuthenticationController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/AuthenticationController.cs
index b8c07591..843a3505 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/AuthenticationController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/AuthenticationController.cs
@@ -5,7 +5,9 @@
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Services;
-using BUTR.Site.NexusMods.Shared.Helpers;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -16,6 +18,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text.Json;
 using System.Threading;
@@ -23,7 +26,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization]
 public sealed class AuthenticationController : ControllerExtended
 {
     private readonly ILogger _logger;
@@ -49,28 +52,19 @@ public AuthenticationController(
     [HttpGet("Authenticate"), AllowAnonymous]
     [Produces("application/json")]
     [ProducesResponseType(typeof(APIResponse<JwtTokenResponse>), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(APIResponse<string>), StatusCodes.Status401Unauthorized)]
-    public async Task<ActionResult<APIResponse<JwtTokenResponse?>>> AuthenticateAsync([FromHeader] NexusModsApiKey apiKey, CancellationToken ct)
+    [ProducesResponseType(typeof(APIResponse<JwtTokenResponse>), StatusCodes.Status401Unauthorized)]
+    public async Task<APIResponseActionResult<JwtTokenResponse?>> AuthenticateAsync([Required, FromHeader] NexusModsApiKey apiKey, [BindTenant] TenantId tenant, CancellationToken ct)
     {
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None)
-            return StatusCode(StatusCodes.Status400BadRequest);
-
         if (await _nexusModsAPIClient.ValidateAPIKeyAsync(apiKey, ct) is not { } validateResponse)
-            return StatusCode(StatusCodes.Status401Unauthorized);
+            return APIResponseError<JwtTokenResponse>("Invalid apiKey!", StatusCodes.Status401Unauthorized);
 
         var userEntity = await _dbContextRead.NexusModsUsers
             .Include(x => x.ToRoles)
-            .Include(x => x.ToDiscord!)
-            .ThenInclude(x => x.ToTokens)
-            .Include(x => x.ToGOG!)
-            .ThenInclude(x => x.ToTokens)
-            .Include(x => x.ToGOG!)
-            .ThenInclude(x => x.ToOwnedTenants)
-            .Include(x => x.ToSteam!)
-            .ThenInclude(x => x.ToTokens)
-            .Include(x => x.ToSteam!)
-            .ThenInclude(x => x.ToOwnedTenants)
+            .Include(x => x.ToDiscord!).ThenInclude(x => x.ToTokens)
+            .Include(x => x.ToGOG!).ThenInclude(x => x.ToTokens)
+            .Include(x => x.ToGOG!).ThenInclude(x => x.ToOwnedTenants)
+            .Include(x => x.ToSteam!).ThenInclude(x => x.ToTokens)
+            .Include(x => x.ToSteam!).ThenInclude(x => x.ToOwnedTenants)
             .AsSplitQuery()
             .FirstOrDefaultAsync(x => x.NexusModsUserId == validateResponse.UserId, ct);
         var role = userEntity?.ToRoles.FirstOrDefault(x => x.TenantId == tenant)?.Role ?? ApplicationRole.User;
@@ -98,33 +92,23 @@ public AuthenticationController(
     [HttpGet("Validate"), AllowAnonymous]
     [Produces("application/json")]
     [ProducesResponseType(typeof(APIResponse<JwtTokenResponse>), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(APIResponse<string>), StatusCodes.Status401Unauthorized)]
-    public async Task<ActionResult<APIResponse<JwtTokenResponse?>>> ValidateAsync(CancellationToken ct)
+    [ProducesResponseType(typeof(APIResponse<JwtTokenResponse>), StatusCodes.Status401Unauthorized)]
+    public async Task<APIResponseActionResult<JwtTokenResponse?>> ValidateAsync([BindApiKey] NexusModsApiKey apiKey, [BindRole] ApplicationRole role, [BindTenant] TenantId tenant, CancellationToken ct)
     {
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None)
-            return StatusCode(StatusCodes.Status400BadRequest);
-
-        var apiKey = HttpContext.GetAPIKey();
         if (await _nexusModsAPIClient.ValidateAPIKeyAsync(apiKey, ct) is not { } validateResponse)
-            return StatusCode(StatusCodes.Status401Unauthorized);
+            return APIResponseError<JwtTokenResponse>(StatusCodes.Status401Unauthorized);
 
         var userEntity = await _dbContextRead.NexusModsUsers
             .Include(x => x.ToRoles)
-            .Include(x => x.ToDiscord!)
-            .ThenInclude(x => x.ToTokens)
-            .Include(x => x.ToGOG!)
-            .ThenInclude(x => x.ToTokens)
-            .Include(x => x.ToGOG!)
-            .ThenInclude(x => x.ToOwnedTenants)
-            .Include(x => x.ToSteam!)
-            .ThenInclude(x => x.ToTokens)
-            .Include(x => x.ToSteam!)
-            .ThenInclude(x => x.ToOwnedTenants)
+            .Include(x => x.ToDiscord!).ThenInclude(x => x.ToTokens)
+            .Include(x => x.ToGOG!).ThenInclude(x => x.ToTokens)
+            .Include(x => x.ToGOG!).ThenInclude(x => x.ToOwnedTenants)
+            .Include(x => x.ToSteam!).ThenInclude(x => x.ToTokens)
+            .Include(x => x.ToSteam!).ThenInclude(x => x.ToOwnedTenants)
             .AsSplitQuery()
             .FirstOrDefaultAsync(x => x.NexusModsUserId == validateResponse.UserId, ct);
 
-        var role = userEntity?.ToRoles.FirstOrDefault(x => x.TenantId == tenant)?.Role ?? ApplicationRole.User;
+        var userRole = userEntity?.ToRoles.FirstOrDefault(x => x.TenantId == tenant)?.Role ?? ApplicationRole.User;
 
         var typedMetadata = UserTypedMetadata.FromUser(userEntity);
         var metadata = new Dictionary<string, string>
@@ -133,9 +117,9 @@ public AuthenticationController(
         };
         var existingMetadata = HttpContext.GetMetadata();
         var isMetadataEqual = metadata.Count == existingMetadata.Count && metadata.All(
-            d1KV => existingMetadata.TryGetValue(d1KV.Key, out var d2Value) && (d1KV.Value == d2Value || d1KV.Value?.Equals(d2Value) == true));
+            d1KV => existingMetadata.TryGetValue(d1KV.Key, out var d2Value) && (d1KV.Value == d2Value || d1KV.Value.Equals(d2Value)));
 
-        if (role != HttpContext.GetRole() || !isMetadataEqual)
+        if (userRole != role || !isMetadataEqual)
         {
             var generatedToken = await _tokenGenerator.GenerateTokenAsync(new ButrNexusModsUserInfo
             {
@@ -146,10 +130,10 @@ public AuthenticationController(
                 IsSupporter = validateResponse.IsSupporter,
                 IsPremium = validateResponse.IsPremium,
                 APIKey = validateResponse.Key.Value,
-                Role = role.Value,
+                Role = userRole.Value,
                 Metadata = metadata
             });
-            return APIResponse(new JwtTokenResponse(generatedToken.Token, HttpContext.GetProfile(validateResponse, role, metadata)));
+            return APIResponse(new JwtTokenResponse(generatedToken.Token, HttpContext.GetProfile(validateResponse, userRole, metadata)));
         }
 
         var token = Request.Headers["Authorization"].ToString().Replace(ButrNexusModsAuthSchemeConstants.AuthScheme, "").Trim();
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/ControllerExtended.cs b/src/BUTR.Site.NexusMods.Server/Controllers/ControllerExtended.cs
index ed07208d..a41e8ccd 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/ControllerExtended.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/ControllerExtended.cs
@@ -1,5 +1,6 @@
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
 using BUTR.Site.NexusMods.Server.Utils.Http.StreamingJson;
 
 using Microsoft.AspNetCore.Mvc;
@@ -20,11 +21,11 @@ namespace BUTR.Site.NexusMods.Server.Controllers;
 public class ControllerExtended : ControllerBase
 {
     [NonAction]
-    protected ActionResult<APIResponse<PagingData<TResult>?>> APIPagingResponse<TResult, TSource>(Paging<TSource> data, Func<IAsyncEnumerable<TSource>, IAsyncEnumerable<TResult>> func)
+    protected APIResponseActionResult<PagingData<TResult>?> APIPagingResponse<TResult, TSource>(Paging<TSource> data, Func<IAsyncEnumerable<TSource>, IAsyncEnumerable<TResult>> func)
         where TResult : class
         where TSource : class
     {
-        return APIResponse(PagingData<TResult>.Create<TSource>(data, func));
+        return APIResponse(PagingData<TResult>.Create(data, func));
     }
 
     [NonAction]
@@ -35,7 +36,7 @@ protected StreamingJsonActionResult APIPagingResponseStreaming<TResult, TSource>
         var options = HttpContext.RequestServices.GetRequiredService<IOptions<JsonOptions>>().Value;
         IEnumerable<Func<Stream, CancellationToken, Task>> GetContent()
         {
-            yield return (stream, ct_) => JsonSerializer.SerializeAsync(stream, new APIStreamingResponse(string.Empty), options.JsonSerializerOptions, ct_);
+            yield return (stream, ct_) => JsonSerializer.SerializeAsync(stream, new APIStreamingResponse(null), options.JsonSerializerOptions, ct_);
             yield return (stream, ct_) => JsonSerializer.SerializeAsync(stream, data.Metadata, options.JsonSerializerOptions, ct_);
             yield return (stream, ct_) => JsonSerializer.SerializeAsync(stream, func(data.Items), options.JsonSerializerOptions, ct_);
             yield return (stream, ct_) => JsonSerializer.SerializeAsync(stream, new PagingAdditionalMetadata
@@ -48,21 +49,38 @@ IEnumerable<Func<Stream, CancellationToken, Task>> GetContent()
     }
 
     [NonAction]
-    protected ActionResult<APIResponse<PagingData<TResult>?>> APIPagingResponse<TResult>(Paging<TResult> data, Func<IAsyncEnumerable<TResult>, IAsyncEnumerable<TResult>> func)
+    protected APIResponseActionResult<PagingData<TResult>?> APIPagingResponse<TResult>(Paging<TResult> data, Func<IAsyncEnumerable<TResult>, IAsyncEnumerable<TResult>> func)
         where TResult : class
     {
         return APIResponse(PagingData<TResult>.Create(data, func));
     }
 
     [NonAction]
-    protected ActionResult<APIResponse<PagingData<TResult>?>> APIPagingResponse<TResult>(Paging<TResult> paginated)
+    protected APIResponseActionResult<PagingData<TResult>?> APIPagingResponse<TResult>(Paging<TResult> paginated)
         where TResult : class
     {
         return APIResponse(PagingData<TResult>.Create(paginated));
     }
 
     [NonAction]
-    protected ActionResult<APIResponse<T?>> APIResponse<T>([ActionResultObjectValue] T? value) => Models.API.APIResponse.From(value);
+    protected APIResponseActionResult<T?> APIResponse<T>([ActionResultObjectValue] T? value) => APIResponseActionResult<T>.FromResult(value);
+
+    [NonAction]
+    protected APIResponseActionResult<T?> APIResponseError<T>(string error) => APIResponseActionResult<T>.FromError(new ProblemDetails
+    {
+        Detail = error,
+    });
+
     [NonAction]
-    protected ActionResult<APIResponse<T?>> APIResponseError<T>(string error) => Models.API.APIResponse.Error<T>(error);
+    protected APIResponseActionResult<T?> APIResponseError<T>(int statusCode) => APIResponseActionResult<T>.FromError(new ProblemDetails
+    {
+        Status = statusCode,
+    });
+
+    [NonAction]
+    protected APIResponseActionResult<T?> APIResponseError<T>(string error, int statusCode) => APIResponseActionResult<T>.FromError(new ProblemDetails
+    {
+        Detail = error,
+        Status = statusCode,
+    });
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs
new file mode 100644
index 00000000..fb7bdbc4
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs
@@ -0,0 +1,171 @@
+using Bannerlord.ModuleManager;
+
+using BUTR.CrashReport.Models;
+using BUTR.CrashReport.Models.Analyzer;
+using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
+using BUTR.Site.NexusMods.Shared.Helpers;
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Controllers;
+
+[ApiController, Route("api/v1/[controller]"), TenantRequired]
+public sealed class CrashReportsAnalyzerController : ControllerExtended
+{
+    public sealed record CrashReportDiagnosticsResult
+    {
+        public required ICollection<GenericSuggestedFix> Suggestions { get; init; }
+        public required ICollection<ModuleSuggestedFix> ModuleSuggestions { get; init; }
+        public required ICollection<ModuleUpdate> ModuleUpdates { get; init; }
+    }
+
+
+    private readonly ILogger _logger;
+    private readonly IAppDbContextRead _dbContextRead;
+
+    public CrashReportsAnalyzerController(ILogger<CrashReportsAnalyzerController> logger, IAppDbContextRead dbContextRead)
+    {
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        _dbContextRead = dbContextRead ?? throw new ArgumentNullException(nameof(dbContextRead));
+    }
+
+    [HttpPost("GetDiagnostics")]
+    [Produces("application/json")]
+    public async Task<ActionResult<CrashReportDiagnosticsResult?>> GetDiagnosticsAsync([BindTenant] TenantId tenant, [FromBody] CrashReportModel crashReport, [FromServices] ITenantContextAccessor tenantContextAccessor, CancellationToken ct)
+    {
+        if (!TenantId.Values.Contains(tenant)) return BadRequest();
+        tenantContextAccessor.Current = tenant;
+
+        if (tenant == TenantId.Bannerlord)
+        {
+            return Ok(new CrashReportDiagnosticsResult
+            {
+                Suggestions = new List<GenericSuggestedFix>(),
+                ModuleSuggestions = await GetModuleSuggestionsAsync(crashReport, ct).ToListAsync(ct),
+                ModuleUpdates = await GetModuleUpdatesForBannerlordAsync(crashReport, ct).ToListAsync(ct),
+            });
+        }
+
+        return Ok(new CrashReportDiagnosticsResult
+        {
+            Suggestions = new List<GenericSuggestedFix>(),
+            ModuleSuggestions = new List<ModuleSuggestedFix>(),
+            ModuleUpdates = new List<ModuleUpdate>(),
+        });
+    }
+
+    private async IAsyncEnumerable<ModuleSuggestedFix> GetModuleSuggestionsAsync(CrashReportModel crashReport, [EnumeratorCancellation] CancellationToken ct)
+    {
+        static bool GetTypeLoadExceptionLevel(ExceptionModel? exceptionModel, ref int level)
+        {
+            if (exceptionModel is null)
+                return false;
+
+            if (exceptionModel.Type == "System.TypeLoadException")
+                return true;
+
+            level++;
+            return GetTypeLoadExceptionLevel(exceptionModel.InnerException, ref level);
+        }
+
+        await Task.Yield();
+
+        //
+        var level = 1;
+        if (GetTypeLoadExceptionLevel(crashReport.Exception, ref level))
+        {
+            var involvedModule = crashReport.InvolvedModules[level];
+            yield return new ModuleSuggestedFix
+            {
+                ModuleId = involvedModule.ModuleId,
+                Type = ModuleSuggestedFixType.Update,
+            };
+        }
+        //
+
+        //var callStackLines = ex.CallStack.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
+        //var firstCallStackLine = callStackLines[0].Trim();
+        //var stacktrace = crashReport.EnhancedStacktrace.FirstOrDefault(x => firstCallStackLine == $"at {x.Name}");
+    }
+
+    private async IAsyncEnumerable<ModuleUpdate> GetModuleUpdatesForBannerlordAsync(CrashReportModel crashReport, [EnumeratorCancellation] CancellationToken ct)
+    {
+        await Task.Yield();
+
+        if (!ApplicationVersion.TryParse(crashReport.GameVersion, out var gVersion)) yield break;
+
+        var moduleIds = crashReport.Modules.Where(x => !x.IsOfficial && string.IsNullOrEmpty(x.Url) && string.IsNullOrEmpty(x.UpdateInfo))
+            .Select(x => ModuleId.From(x.Id)).ToArray();
+        var nexusModsIds = crashReport.Modules.Where(x => !x.IsOfficial && !string.IsNullOrEmpty(x.Url))
+            .Select(x => NexusModsModId.From(NexusModsUtils.TryParse(x.Url, out _, out var id) ? (int) id : -1))
+            .Where(x => x != -1).ToArray();
+        var nexusModsIds2 = crashReport.Modules.Where(x => !x.IsOfficial && !string.IsNullOrEmpty(x.Url))
+            .Select(x => new { ModuelId = ModuleId.From(x.Id), NexusModsId = NexusModsModId.From(NexusModsUtils.TryParse(x.Url, out _, out var id) ? (int) id : -1) })
+            .Where(x => x.NexusModsId != -1).ToArray();
+        var updateInfos = crashReport.Modules.Where(x => !x.IsOfficial && !string.IsNullOrEmpty(x.UpdateInfo))
+            .Select(x => new { ModuleId = ModuleId.From(x.Id), x.UpdateInfo }).ToArray();
+        var moduleIdVersions = crashReport.Modules
+            .Where(x => !x.IsOfficial).Select(x => new { ModuleId = ModuleId.From(x.Id), Version = ModuleVersion.From(x.Version)}).ToArray();
+
+        // SMAPI uses different update providers - Chucklefish, NexusMods, GitHub
+        // We curectly will only use NexusMods
+        var moduleIdEntries = _dbContextRead.NexusModsModToModuleInfoHistory.Where(x => nexusModsIds.Contains(x.NexusModsMod.NexusModsModId));
+        var nexusModsIdEntries = _dbContextRead.NexusModsModToModuleInfoHistory.Where(x => moduleIds.Contains(x.Module.ModuleId));
+        //var updateInfoEntries = _dbContextRead.NexusModsModToModuleInfoHistory.Where(x => moduleIds.Contains(x.Module.ModuleId));
+        //var entries = _dbContextRead.NexusModsModToModuleInfoHistory.Where(x => moduleIds.Contains(x.Module.ModuleId));
+        var entries = moduleIdEntries.Concat(nexusModsIdEntries);
+        var compatibleWithGameVersion = entries.AsEnumerable().Select(x => new
+        {
+            ModuleId = x.Module.ModuleId,
+            ModuleVersion = ApplicationVersion.TryParse(x.ModuleVersion.Value, out var v) ? v : ApplicationVersion.Empty,
+            ModuleInfo = ModuleInfoModel.Create(x.ModuleInfo),
+        }).Where(x => x.ModuleInfo.DependentModuleMetadatas.Any(y =>
+        {
+            // So how do we understand what game version the module requires?
+            // Generally, any mod will need at least the Native module to work.
+            // But there were mods like that Space Invader mod that will just require the engine - they still depend on Native.
+            //
+            // We also need to understand how versions work.
+            // Version = v1.0.0 means that at least v1.0.0 is required
+            // Version = v1.0.0-v1.2.0 means that at least v1.0.0 is required, but not higher than v1.2.0
+
+            if (y.Id != "Native") return false;
+            if (y.Version == ApplicationVersion.Empty && y.VersionRange == ApplicationVersionRange.Empty) return false;
+            return (y.Version != ApplicationVersion.Empty && y.Version <= gVersion) ||
+                   (y.VersionRange != ApplicationVersionRange.Empty && y.VersionRange.Min <= gVersion && y.VersionRange.Max > gVersion);
+        })).GroupBy(x => x.ModuleId).Select(x => x.MaxBy(y => y.ModuleVersion, new ApplicationVersionComparer())!).ToArray();
+
+        var latestUpdates = compatibleWithGameVersion.Where(x =>
+        {
+            var tuple = moduleIdVersions.FirstOrDefault(y => y.ModuleId == x.ModuleId);
+            if (tuple is null)
+                return false;
+
+            if (ApplicationVersion.TryParse(tuple.Version.Value, out var mVersion))
+                return mVersion < x.ModuleVersion;
+            return false;
+        }).ToArray();
+
+        foreach (var x in latestUpdates)
+        {
+            yield return new ModuleUpdate
+            {
+                ModuleId = x.ModuleId.Value,
+                ModuleVersion = x.ModuleVersion.ToString(),
+                IsModuleInvolved = crashReport.InvolvedModules.Any(y => y.ModuleId == x.ModuleId)
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs
index 5b877b7b..0a2eeb9e 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs
@@ -1,12 +1,12 @@
-using Bannerlord.ModuleManager;
-
-using BUTR.Authentication.NexusMods.Authentication;
-using BUTR.CrashReport.Models;
+using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Server.Utils.Http.StreamingJson;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
@@ -25,7 +25,8 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[TenantNotRequired]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantRequired]
 public sealed class CrashReportsController : ControllerExtended
 {
     public sealed record CrashReportModel2
@@ -35,19 +36,13 @@ public sealed record CrashReportModel2
         public required GameVersion GameVersion { get; init; }
         public required ExceptionTypeId ExceptionType { get; init; }
         public required string Exception { get; init; }
-        public required DateTime Date { get; init; }
+        public required DateTimeOffset Date { get; init; }
         public required CrashReportUrl Url { get; init; }
         public required ImmutableArray<ModuleId> InvolvedModules { get; init; }
         public CrashReportStatus Status { get; init; } = CrashReportStatus.New;
         public string Comment { get; init; } = string.Empty;
     }
 
-    public record ModuleUpdate
-    {
-        public ModuleId ModuleId { get; init; }
-        public ModuleVersion ModuleVersion { get; init; }
-    }
-
     private sealed record ModuleIdToVersionView
     {
         public required ModuleId ModuleId { get; init; }
@@ -60,7 +55,7 @@ private sealed record UserCrashReportView
         public required GameVersion GameVersion { get; init; }
         public required ExceptionTypeId ExceptionType { get; init; }
         public required string Exception { get; init; }
-        public required DateTime CreatedAt { get; init; }
+        public required DateTimeOffset CreatedAt { get; init; }
         public required ModuleId[] ModuleIds { get; init; }
         public required ModuleIdToVersionView[] ModuleIdToVersion { get; init; }
         public required ModuleId? TopInvolvedModuleId { get; init; }
@@ -83,7 +78,7 @@ public CrashReportsController(ILogger<CrashReportsController> logger, IAppDbCont
         _dbContextWrite = dbContextWrite ?? throw new ArgumentNullException(nameof(dbContextWrite));
     }
 
-    private async Task<BasePaginated<UserCrashReportView, CrashReportModel2>> PaginatedBaseAsync(PaginatedQuery query, CancellationToken ct)
+    private async Task<BasePaginated<UserCrashReportView, CrashReportModel2>> PaginatedBaseAsync(PaginatedQuery query, NexusModsUserId userId, CancellationToken ct)
     {
         var page = query.Page;
         var pageSize = Math.Max(Math.Min(query.PageSize, 50), 5);
@@ -92,8 +87,6 @@ private async Task<BasePaginated<UserCrashReportView, CrashReportModel2>> Pagina
             ? new List<Sorting> { new() { Property = nameof(CrashReportEntity.CreatedAt), Type = SortingType.Descending } }
             : query.Sotings;
 
-        var userId = HttpContext.GetUserId();
-
         var user = await _dbContextRead.NexusModsUsers
             .Include(x => x.ToModules)
             .ThenInclude(x => x.Module)
@@ -163,40 +156,36 @@ IQueryable<UserCrashReportView> DbQueryBase(Expression<Func<CrashReportEntity, b
 
     [HttpPost("Paginated")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<CrashReportModel2>?>>> PaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<CrashReportModel2>?>> PaginatedAsync([FromBody] PaginatedQuery query, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var (paginated, transform) = await PaginatedBaseAsync(query, ct);
+        var (paginated, transform) = await PaginatedBaseAsync(query, userId, ct);
         return APIPagingResponse(paginated, transform);
     }
 
     [HttpPost("PaginatedStreaming")]
     [Produces("application/x-ndjson-butr-paging")]
     [ApiExplorerSettings(IgnoreApi = true)]
-    public async Task<StreamingJsonActionResult> PaginatedStreamingAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<StreamingJsonActionResult> PaginatedStreamingAsync([FromBody] PaginatedQuery query, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var (paginated, transform) = await PaginatedBaseAsync(query, ct);
+        var (paginated, transform) = await PaginatedBaseAsync(query, userId, ct);
         return APIPagingResponseStreaming(paginated, transform);
     }
 
     [HttpGet("Autocomplete")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IQueryable<string>?>> Autocomplete([FromQuery] ModuleId modId)
+    public APIResponseActionResult<IQueryable<string>?> Autocomplete([FromQuery] ModuleId modId)
     {
         return APIResponse(_dbContextRead.AutocompleteStartsWith<CrashReportToModuleMetadataEntity, ModuleId>(x => x.Module.ModuleId, modId));
     }
 
     [HttpPost("Update")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> UpdateAsync([FromBody] CrashReportModel2 updatedCrashReport)
+    public async Task<APIResponseActionResult<string?>> UpdateAsync([FromBody] CrashReportModel2 updatedCrashReport, [BindUserId] NexusModsUserId userId, [BindTenant] TenantId tenant)
     {
         var entityFactory = _dbContextWrite.GetEntityFactory();
-        await using var _ = _dbContextWrite.CreateSaveScope();
-
-        var userId = HttpContext.GetUserId();
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None) return BadRequest();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
 
-        var entity = new NexusModsUserToCrashReportEntity()
+        var entity = new NexusModsUserToCrashReportEntity
         {
             TenantId = tenant,
             NexusModsUser = entityFactory.GetOrCreateNexusModsUser(userId),
@@ -204,63 +193,7 @@ public async Task<StreamingJsonActionResult> PaginatedStreamingAsync([FromBody]
             Status = updatedCrashReport.Status,
             Comment = updatedCrashReport.Comment
         };
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToCrashReports, entity);
+        await _dbContextWrite.NexusModsUserToCrashReports.UpsertOnSaveAsync(entity);
         return APIResponse("Updated successful!");
     }
-
-
-    [AllowAnonymous]
-    [HttpPost("GetUpdates")]
-    [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<IEnumerable<ModuleUpdate>?>>> UpdateAsync([FromQuery] TenantId tenant, [FromBody] CrashReportModel crashReport, [FromServices] ITenantContextAccessor tenantContextAccessor)
-    {
-        if (!TenantId.Values.Contains(tenant)) return BadRequest();
-        tenantContextAccessor.Current = tenant;
-
-        var moduleIds = crashReport.Modules.Where(x => !x.IsOfficial).Select(x => ModuleId.From(x.Id)).ToArray();
-        var moduleIdVersions = crashReport.Modules.Where(x => !x.IsOfficial).Select(x => (Id: ModuleId.From(x.Id), Version: ModuleVersion.From(x.Version))).ToArray();
-        var entries = _dbContextRead.NexusModsModToModuleInfoHistory.Where(x => moduleIds.Contains(x.Module.ModuleId));
-
-        if (tenant == TenantId.Bannerlord)
-        {
-            if (!ApplicationVersion.TryParse(crashReport.GameVersion, out var gVersion)) return BadRequest();
-
-            var compatible = entries
-                .AsEnumerable()
-                .Select(x => new
-                {
-                    ModuleId = x.Module.ModuleId,
-                    ModuleVersion = ApplicationVersion.TryParse(x.ModuleVersion.Value, out var v) ? v : ApplicationVersion.Empty,
-                    ModuleInfo = x.ModuleInfo,
-                })
-                .Where(x => x.ModuleInfo.DependentModuleMetadatas.Any(y =>
-                {
-                    if (y.Id != "Native") return false;
-                    var version = y.Version ?? string.Empty;
-                    if (version.StartsWith("ev")) version = version.Substring(1);
-                    return ApplicationVersion.TryParse(version, out var nVersion) && nVersion <= gVersion;
-                }))
-                .GroupBy(x => x.ModuleId)
-                .Select(x => x.MaxBy(y => y.ModuleVersion, new ApplicationVersionComparer())!)
-                .ToArray();
-
-            var updates = compatible.Where(x =>
-            {
-                var curentModule = moduleIdVersions.First(y => y.Id == x.ModuleId);
-
-                if (ApplicationVersion.TryParse(curentModule.Version.Value, out var cVersion))
-                    return cVersion < x.ModuleVersion;
-
-                return false;
-            }).ToArray();
-
-            return APIResponse(updates.Select(x => new ModuleUpdate
-            {
-                ModuleId = x.ModuleId,
-                ModuleVersion = ModuleVersion.From(x.ModuleVersion.ToString()),
-            }));
-        }
-
-        return APIResponse(Enumerable.Empty<ModuleUpdate>());
-    }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/DiscordController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/DiscordController.cs
index 6b9f5d7e..ff1528df 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/DiscordController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/DiscordController.cs
@@ -2,8 +2,10 @@
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
-using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Services;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
 using Microsoft.AspNetCore.Authorization;
@@ -18,7 +20,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantNotRequired]
 public sealed class DiscordController : ControllerExtended
 {
     public sealed record DiscordOAuthUrlModel(string Url, Guid State);
@@ -42,7 +44,7 @@ public DiscordController(DiscordClient discordClient, IDiscordStorage discordSto
 
     [HttpGet("GetOAuthUrl")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<DiscordOAuthUrlModel?>> GetOAuthUrl()
+    public APIResponseActionResult<DiscordOAuthUrlModel?> GetOAuthUrl()
     {
         var (url, state) = _discordClient.GetOAuthUrl();
         return APIResponse(new DiscordOAuthUrlModel(url, state));
@@ -50,28 +52,26 @@ public DiscordController(DiscordClient discordClient, IDiscordStorage discordSto
 
     [HttpGet("Link")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> LinkAsync([FromQuery] string code, CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> LinkAsync([FromQuery] string code, [BindRole] ApplicationRole role, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
         var tokens = await _discordClient.CreateTokensAsync(code, ct);
         if (tokens is null)
             return APIResponseError<string>("Failed to link!");
 
-        var userId = HttpContext.GetUserId();
         var userInfo = await _discordClient.GetUserInfoAsync(tokens, ct);
 
         if (userInfo is null || !await _discordStorage.UpsertAsync(userId, userInfo.User.Id, tokens))
             return APIResponseError<string>("Failed to link!");
 
-        await UpdateMetadataInternalAsync(ct);
+        await UpdateMetadataInternalAsync(role, userId, ct);
 
         return APIResponse("Linked successful!");
     }
 
     [HttpPost("Unlink")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> UnlinkAsync(CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> UnlinkAsync([BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var userId = HttpContext.GetUserId();
         var tokens = HttpContext.GetDiscordTokens();
 
         if (tokens?.Data is null)
@@ -95,9 +95,9 @@ public DiscordController(DiscordClient discordClient, IDiscordStorage discordSto
 
     [HttpPost("UpdateMetadata")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> UpdateMetadataAsync(CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> UpdateMetadataAsync([BindRole] ApplicationRole role, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        if (await UpdateMetadataInternalAsync(ct) is not { } result)
+        if (await UpdateMetadataInternalAsync(role, userId, ct) is not { } result)
             return APIResponseError<string>("Failed to update");
         return result ? APIResponse("") : APIResponseError<string>("Failed to update");
     }
@@ -105,9 +105,8 @@ public DiscordController(DiscordClient discordClient, IDiscordStorage discordSto
 
     [HttpPost("GetUserInfo")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<DiscordUserInfo?>>> GetUserInfoByAccessTokenAsync(CancellationToken ct)
+    public async Task<APIResponseActionResult<DiscordUserInfo?>> GetUserInfoByAccessTokenAsync([BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var userId = HttpContext.GetUserId();
         var tokens = HttpContext.GetDiscordTokens();
 
         if (tokens?.Data is null)
@@ -124,10 +123,8 @@ public DiscordController(DiscordClient discordClient, IDiscordStorage discordSto
         return APIResponse(result);
     }
 
-    private async Task<bool?> UpdateMetadataInternalAsync(CancellationToken ct)
+    private async Task<bool?> UpdateMetadataInternalAsync(ApplicationRole role, NexusModsUserId userId, CancellationToken ct)
     {
-        var role = HttpContext.GetRole();
-        var userId = HttpContext.GetUserId();
         var tokens = HttpContext.GetDiscordTokens();
 
         if (tokens?.Data is null)
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/ExposedModsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/ExposedModsController.cs
index 629a19fe..da2d5da7 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/ExposedModsController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/ExposedModsController.cs
@@ -4,6 +4,9 @@
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -16,7 +19,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantRequired]
 public class ExposedModsController : ControllerExtended
 {
     public record ExposedNexusModsModModel(NexusModsModId NexusModsModId, ExposedModuleModel[] Mods);
@@ -34,19 +37,19 @@ public ExposedModsController(ILogger<ExposedModsController> logger, IAppDbContex
 
     [HttpPost("Paginated")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<ExposedNexusModsModModel>?>>> PaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<ExposedNexusModsModModel>?>> PaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
     {
         var paginated = await _dbContextRead.NexusModsModModules
             .Where(x => x.LinkType == NexusModsModToModuleLinkType.ByUnverifiedFileExposure)
             .PaginatedAsync(query, 100, new() { Property = nameof(NexusModsModEntity.NexusModsModId), Type = SortingType.Ascending }, ct);
 
         return APIPagingResponse(paginated, items => items.GroupBy(x => x.NexusModsMod.NexusModsModId).SelectAwaitWithCancellation(async (x, ct2) =>
-            new ExposedNexusModsModModel(x.Key, await x.Select(y => new ExposedModuleModel(y.Module.ModuleId, y.LastUpdateDate)).ToArrayAsync(ct2))));
+            new ExposedNexusModsModModel(x.Key, await x.Select(y => new ExposedModuleModel(y.Module.ModuleId, y.LastUpdateDate.ToUniversalTime())).ToArrayAsync(ct2))));
     }
 
     [HttpGet("Autocomplete")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IQueryable<string>?>> Autocomplete([FromQuery] ModuleId modId)
+    public APIResponseActionResult<IQueryable<string>?> Autocomplete([FromQuery] ModuleId modId)
     {
         return APIResponse(_dbContextRead.AutocompleteStartsWith<NexusModsModToModuleEntity, ModuleId>(x => x.Module.ModuleId, modId));
     }
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/GOGController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/GOGController.cs
index 77d09b29..b6492622 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/GOGController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/GOGController.cs
@@ -1,8 +1,10 @@
 using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
-using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Services;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -13,7 +15,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantNotRequired]
 public sealed class GOGController : ControllerExtended
 {
     public sealed record GOGOAuthUrlModel(string Url);
@@ -32,21 +34,19 @@ public GOGController(IGOGStorage gogStorage, GOGAuthClient gogAuthClient, GOGEmb
 
     [HttpGet("GetOAuthUrl")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<GOGOAuthUrlModel?>> GetOpenIdUrl()
+    public APIResponseActionResult<GOGOAuthUrlModel?> GetOpenIdUrl()
     {
         return APIResponse(new GOGOAuthUrlModel(_gogAuthClient.GetOAuth2Url()));
     }
 
     [HttpGet("Link")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> LinkAsync([FromQuery] string code, CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> LinkAsync([FromQuery] string code, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
         var tokens = await _gogAuthClient.CreateTokensAsync(code, ct);
         if (tokens is null)
             return APIResponseError<string>("Failed to link!");
 
-        var userId = HttpContext.GetUserId();
-
         if (!await _gogStorage.CheckOwnedGamesAsync(userId, tokens.UserId, tokens))
             return APIResponseError<string>("Failed to link!");
 
@@ -58,9 +58,8 @@ public GOGController(IGOGStorage gogStorage, GOGAuthClient gogAuthClient, GOGEmb
 
     [HttpPost("Unlink")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> UnlinkAsync()
+    public async Task<APIResponseActionResult<string?>> UnlinkAsync([BindUserId] NexusModsUserId userId)
     {
-        var userId = HttpContext.GetUserId();
         var tokens = HttpContext.GetGOGTokens();
 
         if (tokens?.Data is null)
@@ -74,9 +73,8 @@ public GOGController(IGOGStorage gogStorage, GOGAuthClient gogAuthClient, GOGEmb
 
     [HttpPost("GetUserInfo")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<GOGUserInfo?>>> GetUserInfoByAccessTokenAsync(CancellationToken ct)
+    public async Task<APIResponseActionResult<GOGUserInfo?>> GetUserInfoByAccessTokenAsync([BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var userId = HttpContext.GetUserId();
         var tokens = HttpContext.GetGOGTokens();
 
         if (tokens?.Data is null)
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/GamePublicApiDiffController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/GamePublicApiDiffController.cs
index 64c4c419..81e1dfe3 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/GamePublicApiDiffController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/GamePublicApiDiffController.cs
@@ -1,6 +1,8 @@
 using BUTR.Site.NexusMods.Server.Models;
-using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Services;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -11,7 +13,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]")]
+[ApiController, Route("api/v1/[controller]"), TenantRequired]
 public sealed class GamePublicApiDiffController : ControllerExtended
 {
     private const string basePath = "/public-api-diff";
@@ -27,17 +29,17 @@ public GamePublicApiDiffController(ILogger<GamePublicApiDiffController> logger,
 
     [HttpGet("List")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IEnumerable<string>?>> List() => APIResponse(_diffProvider.List(basePath));
+    public APIResponseActionResult<IEnumerable<string>?> List() => APIResponse(_diffProvider.List(basePath));
 
     [HttpGet("TreeFlat")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IEnumerable<string>?>> TreeFlat(string entry) => APIResponse(_diffProvider.TreeFlat(basePath, entry));
+    public APIResponseActionResult<IEnumerable<string>?> TreeFlat(string entry) => APIResponse(_diffProvider.TreeFlat(basePath, entry));
 
     [HttpGet("Get")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IEnumerable<string>?>> Get(string path, CancellationToken ct) => APIResponse(_diffProvider.Get(basePath, path, ct));
+    public APIResponseActionResult<IEnumerable<string>?> Get(string path, CancellationToken ct) => APIResponse(_diffProvider.Get(basePath, path, ct));
 
     [HttpPost("Search")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IEnumerable<string>?>> Search(TextSearchFiltering[] filters, CancellationToken ct) => APIResponse(_diffProvider.Search(basePath, filters, ct));
+    public APIResponseActionResult<IEnumerable<string>?> Search(TextSearchFiltering[] filters, CancellationToken ct) => APIResponse(_diffProvider.Search(basePath, filters, ct));
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/GameSourceDiffController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/GameSourceDiffController.cs
index 1061aa0c..3001e772 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/GameSourceDiffController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/GameSourceDiffController.cs
@@ -1,10 +1,13 @@
 using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
-using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Services;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
@@ -14,7 +17,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantRequired]
 public sealed class GameSourceDiffController : ControllerExtended
 {
     private const string basePath = "/source-api-diff";
@@ -30,40 +33,40 @@ public GameSourceDiffController(ILogger<GameSourceDiffController> logger, DiffPr
 
     [HttpGet("List")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IEnumerable<string>?>> List()
+    public APIResponseActionResult<IEnumerable<string>?> List()
     {
         if (!HttpContext.OwnsTenantGame())
-            return Unauthorized();
+            return APIResponseError<IEnumerable<string>?>(StatusCodes.Status401Unauthorized);
 
         return APIResponse(_diffProvider.List(basePath));
     }
 
     [HttpGet("TreeFlat")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IEnumerable<string>?>> TreeFlat(string entry)
+    public APIResponseActionResult<IEnumerable<string>?> TreeFlat(string entry)
     {
         if (!HttpContext.OwnsTenantGame())
-            return Unauthorized();
+            return APIResponseError<IEnumerable<string>?>(StatusCodes.Status401Unauthorized);
 
         return APIResponse(_diffProvider.TreeFlat(basePath, entry));
     }
 
     [HttpGet("Get")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IEnumerable<string>?>> Get(string path, CancellationToken ct)
+    public APIResponseActionResult<IEnumerable<string>?> Get(string path, CancellationToken ct)
     {
         if (!HttpContext.OwnsTenantGame())
-            return Unauthorized();
+            return APIResponseError<IEnumerable<string>?>(StatusCodes.Status401Unauthorized);
 
         return APIResponse(_diffProvider.Get(basePath, path, ct));
     }
 
     [HttpPost("Search")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IEnumerable<string>?>> Search(TextSearchFiltering[] filters, CancellationToken ct)
+    public APIResponseActionResult<IEnumerable<string>?> Search(TextSearchFiltering[] filters, CancellationToken ct)
     {
         if (!HttpContext.OwnsTenantGame())
-            return Unauthorized();
+            return APIResponseError<IEnumerable<string>?>(StatusCodes.Status401Unauthorized);
 
         return APIResponse(_diffProvider.Search(basePath, filters, ct));
     }
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsArticleController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsArticleController.cs
index 9c3e0d5e..0ed736f3 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsArticleController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsArticleController.cs
@@ -4,6 +4,9 @@
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -17,7 +20,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantRequired]
 public class NexusModsArticleController : ControllerExtended
 {
     public record NexusModsArticleModel(NexusModsArticleId NexusModsArticleId, string Title, NexusModsUserId NexusModsUserId, NexusModsUserName Author, DateTimeOffset CreateDate);
@@ -34,11 +37,10 @@ public NexusModsArticleController(ILogger<NexusModsArticleController> logger, IA
 
     [HttpPost("Paginated")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<NexusModsArticleModel>?>>> PaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<NexusModsArticleModel>?>> PaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
     {
         var paginated = await _dbContextRead.NexusModsArticles
-            .Include(x => x.NexusModsUser)
-            .ThenInclude(x => x.Name)
+            .Include(x => x.NexusModsUser).ThenInclude(x => x.Name)
             .Select(x => new
             {
                 NexusModsArticleId = x.NexusModsArticleId,
@@ -54,11 +56,10 @@ public NexusModsArticleController(ILogger<NexusModsArticleController> logger, IA
 
     [HttpGet("Autocomplete")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IQueryable<string>?>> Autocomplete([FromQuery] string authorName)
+    public APIResponseActionResult<IQueryable<string>?> Autocomplete([FromQuery] string authorName)
     {
         var moduleIds = _dbContextRead.NexusModsArticles
-            .Include(x => x.NexusModsUser)
-            .ThenInclude(x => x.Name)
+            .Include(x => x.NexusModsUser).ThenInclude(x => x.Name)
             .Select(x => x.NexusModsUser)
             .Select(x => x.Name!)
             .Where(x => EF.Functions.ILike(x.Name.Value, $"{authorName}%"))
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsModController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsModController.cs
index 8295b4b1..e7b66eb0 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsModController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsModController.cs
@@ -5,6 +5,9 @@
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
 using BUTR.Site.NexusMods.Server.Services;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
 using Microsoft.AspNetCore.Authorization;
@@ -19,7 +22,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantRequired]
 public sealed class NexusModsModController : ControllerExtended
 {
     public sealed record RawNexusModsModModel(NexusModsModId NexusModsModId, string Name);
@@ -47,11 +50,8 @@ public NexusModsModController(ILogger<NexusModsModController> logger, NexusModsA
 
     [HttpGet("Raw/{gameDomain}/{modId}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<RawNexusModsModModel?>>> RawAsync(NexusModsGameDomain gameDomain, NexusModsModId modId, CancellationToken ct)
+    public async Task<APIResponseActionResult<RawNexusModsModModel?>> RawAsync(NexusModsGameDomain gameDomain, NexusModsModId modId, [BindApiKey] NexusModsApiKey apiKey, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var userId = HttpContext.GetUserId();
-        var apiKey = HttpContext.GetAPIKey();
-
         if (await _nexusModsAPIClient.GetModAsync(gameDomain, modId, apiKey, ct) is not { } modInfo)
             return APIResponseError<RawNexusModsModModel>("Mod not found!");
 
@@ -63,32 +63,29 @@ public NexusModsModController(ILogger<NexusModsModController> logger, NexusModsA
 
 
     [HttpGet("ToModuleManualLink")]
-    [Authorize(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
+    [ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToModuleManualLinkAsync([FromQuery] NexusModsModToModuleManualLinkQuery query)
+    public async Task<APIResponseActionResult<string?>> ToModuleManualLinkAsync([FromQuery] NexusModsModToModuleManualLinkQuery query, [BindTenant] TenantId tenant)
     {
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
         var entityFactory = _dbContextWrite.GetEntityFactory();
 
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None) return BadRequest();
-
         var nexusModsModToModule = new NexusModsModToModuleEntity
         {
             TenantId = tenant,
             NexusModsMod = entityFactory.GetOrCreateNexusModsMod(query.NexusModsModId),
             Module = entityFactory.GetOrCreateModule(query.ModuleId),
             LinkType = NexusModsModToModuleLinkType.ByStaff,
-            LastUpdateDate = DateTime.UtcNow,
+            LastUpdateDate = DateTimeOffset.UtcNow,
         };
-        _dbContextWrite.FutureUpsert(x => x.NexusModsModModules, nexusModsModToModule);
+        await _dbContextWrite.NexusModsModModules.UpsertOnSaveAsync(nexusModsModToModule);
         return APIResponse("Linked successful!");
     }
 
     [HttpGet("ToModuleManualUnlink")]
-    [Authorize(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
+    [ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToModuleManualUnlinkAsync([FromQuery] NexusModsModToModuleManualLinkQuery query)
+    public async Task<APIResponseActionResult<string?>> ToModuleManualUnlinkAsync([FromQuery] NexusModsModToModuleManualLinkQuery query)
     {
         await _dbContextWrite.NexusModsModModules
             .Where(x => x.Module.ModuleId == query.ModuleId && x.NexusModsMod.NexusModsModId == query.NexusModsModId && x.LinkType == NexusModsModToModuleLinkType.ByStaff)
@@ -98,9 +95,9 @@ await _dbContextWrite.NexusModsModModules
     }
 
     [HttpPost("ToModuleManualLinkPaginated")]
-    [Authorize(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
+    [ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<NexusModsModToModuleModel>?>>> ToModuleManualLinkPaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<NexusModsModToModuleModel>?>> ToModuleManualLinkPaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
     {
         var paginated = await _dbContextRead.NexusModsModModules
             .Where(x => x.LinkType == NexusModsModToModuleLinkType.ByStaff)
@@ -112,21 +109,15 @@ await _dbContextWrite.NexusModsModModules
 
     [HttpPost("AvailablePaginated")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<NexusModsModAvailableModel>?>>> AvailablePaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<NexusModsModAvailableModel>?>> AvailablePaginatedAsync([FromBody] PaginatedQuery query, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var userId = HttpContext.GetUserId();
-
         var userToModIds = _dbContextRead.NexusModsUserToNexusModsMods
-            .Include(x => x.NexusModsMod)
-            .ThenInclude(x => x.Name)
+            .Include(x => x.NexusModsMod).ThenInclude(x => x.Name)
             .Where(x => x.NexusModsUser.NexusModsUserId == userId)
             .Select(x => x.NexusModsMod);
 
         var userToModuleIdsToModIds = _dbContextRead.NexusModsUserToModules
-            .Include(x => x.Module)
-            .ThenInclude(x => x.ToNexusModsMods)
-            .ThenInclude(x => x.NexusModsMod)
-            .ThenInclude(x => x.Name)
+            .Include(x => x.Module).ThenInclude(x => x.ToNexusModsMods).ThenInclude(x => x.NexusModsMod).ThenInclude(x => x.Name)
             .Where(x => x.NexusModsUser.NexusModsUserId == userId)
             .Select(x => x.Module)
             .SelectMany(x => x.ToNexusModsMods)
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsUserController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsUserController.cs
index 34480442..264cf245 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsUserController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsUserController.cs
@@ -5,6 +5,9 @@
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
 using BUTR.Site.NexusMods.Server.Services;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
 using Microsoft.AspNetCore.Authorization;
@@ -13,7 +16,6 @@
 using Microsoft.Extensions.Logging;
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
@@ -21,7 +23,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantRequired]
 public sealed class NexusModsUserController : ControllerExtended
 {
     public sealed record SetRoleBody(NexusModsUserId NexusModsUserId, ApplicationRole Role);
@@ -38,6 +40,14 @@ public sealed record NexusModsUserToModuleManualLinkModel(NexusModsUserId NexusM
 
     public sealed record NexusModsUserToNexusModsModManualLinkModel(NexusModsModId NexusModsModId, ImmutableArray<NexusModsUserId> AllowedNexusModsUserIds);
 
+    public sealed record NexusModsModModel(
+        NexusModsModId NexusModsModId,
+        string Name,
+        ImmutableArray<NexusModsUserId> AllowedNexusModsUserIds,
+        ImmutableArray<NexusModsUserId> ManuallyLinkedNexusModsUserIds,
+        ImmutableArray<ModuleId> ManuallyLinkedModuleIds,
+        ImmutableArray<ModuleId> KnownModuleIds);
+
     private readonly ILogger _logger;
     private readonly NexusModsAPIClient _nexusModsAPIClient;
     private readonly NexusModsModFileParser _nexusModsModFileParser;
@@ -56,48 +66,38 @@ public NexusModsUserController(ILogger<NexusModsUserController> logger, NexusMod
 
     [HttpGet("Profile")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<ProfileModel?>> Profile() => APIResponse(HttpContext.GetProfile());
+    public APIResponseActionResult<ProfileModel?> Profile() => APIResponse(HttpContext.GetProfile());
 
 
     [HttpPost("SetRole")]
-    [Authorize(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
+    [ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> SetRoleAsync([FromQuery] SetRoleBody body, CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> SetRoleAsync([FromQuery] SetRoleBody body, [BindTenant] TenantId tenant, CancellationToken ct)
     {
-        await using var _ = _dbContextWrite.CreateSaveScope();
-
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None) return BadRequest();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
 
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUsers, NexusModsUserEntity.CreateWithRole(body.NexusModsUserId, tenant, body.Role));
+        await _dbContextWrite.NexusModsUsers.UpsertOnSaveAsync(NexusModsUserEntity.CreateWithRole(body.NexusModsUserId, tenant, body.Role));
         return APIResponse("Set successful!");
     }
 
     [HttpDelete("RemoveRole")]
-    [Authorize(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
+    [ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> RemoveRoleAsync([FromQuery] RemoveRoleBody body, CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> RemoveRoleAsync([FromQuery] RemoveRoleBody body, [BindTenant] TenantId tenant, CancellationToken ct)
     {
-        await using var _ = _dbContextWrite.CreateSaveScope();
-
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None) return BadRequest();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
 
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUsers, NexusModsUserEntity.CreateWithRole(body.NexusModsUserId, tenant, ApplicationRole.User));
+        await _dbContextWrite.NexusModsUsers.UpsertOnSaveAsync(NexusModsUserEntity.CreateWithRole(body.NexusModsUserId, tenant, ApplicationRole.User));
         return APIResponse("Removed successful!");
     }
 
     [HttpPost("ToNexusModsModPaginated")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<NexusModsModModel>?>>> ToNexusModsModPaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<NexusModsModModel>?>> ToNexusModsModPaginatedAsync([FromBody] PaginatedQuery query, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var userId = HttpContext.GetUserId();
 
-       var availableModsByNexusModsModLinkage = _dbContextRead.NexusModsUsers
-            .Include(x => x.ToNexusModsMods)
-            .ThenInclude(x => x.NexusModsMod)
-            .ThenInclude(x => x.ToNexusModsUsers)
-            .ThenInclude(x => x.NexusModsUser)
+        var availableModsByNexusModsModLinkage = _dbContextRead.NexusModsUsers
+            .Include(x => x.ToNexusModsMods).ThenInclude(x => x.NexusModsMod).ThenInclude(x => x.ToNexusModsUsers).ThenInclude(x => x.NexusModsUser)
             .AsSplitQuery()
             .Where(x => x.NexusModsUserId == userId)
             .SelectMany(x => x.ToNexusModsMods)
@@ -127,16 +127,11 @@ public NexusModsUserController(ILogger<NexusModsUserController> logger, NexusMod
 
     [HttpPost("ToNexusModsModUpdate")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToNexusModsModUpdateAsync([FromBody] NexusModsUserToNexusModsModQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> ToNexusModsModUpdateAsync([FromBody] NexusModsUserToNexusModsModQuery query, [BindApiKey] NexusModsApiKey apiKey, [BindUserId] NexusModsUserId userId, [BindTenant] TenantId tenant, CancellationToken ct)
     {
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
         var entityFactory = _dbContextWrite.GetEntityFactory();
 
-        var userId = HttpContext.GetUserId();
-        var apiKey = HttpContext.GetAPIKey();
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None) return BadRequest();
-
         var gameDomain = tenant.ToGameDomain();
 
         if (await _nexusModsAPIClient.GetModAsync(gameDomain, query.NexusModsModId, apiKey, ct) is not { } modInfo)
@@ -151,23 +146,18 @@ public NexusModsUserController(ILogger<NexusModsUserController> logger, NexusMod
             NexusModsMod = entityFactory.GetOrCreateNexusModsMod(query.NexusModsModId),
             Name = modInfo.Name,
         };
-        _dbContextWrite.FutureUpsert(x => x.NexusModsModName, entity);
+        await _dbContextWrite.NexusModsModName.UpsertOnSaveAsync(entity);
         return APIResponse("Updated successful!");
     }
 
 
     [HttpGet("ToNexusModsModLink")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToNexusModsModLinkAsync([FromQuery] NexusModsUserToNexusModsModQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> ToNexusModsModLinkAsync([FromQuery] NexusModsUserToNexusModsModQuery query, [BindApiKey] NexusModsApiKey apiKey, [BindUserId] NexusModsUserId userId, [BindTenant] TenantId tenant, CancellationToken ct)
     {
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
         var entityFactory = _dbContextWrite.GetEntityFactory();
 
-        var userId = HttpContext.GetUserId();
-        var apiKey = HttpContext.GetAPIKey();
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None) return BadRequest();
-
         var gameDomain = tenant.ToGameDomain();
 
         if (await _nexusModsAPIClient.GetModAsync(gameDomain, query.NexusModsModId, apiKey, ct) is not { } modInfo)
@@ -189,9 +179,9 @@ public NexusModsUserController(ILogger<NexusModsUserController> logger, NexusMod
                 NexusModsMod = entityFactory.GetOrCreateNexusModsMod(query.NexusModsModId),
                 Module = entityFactory.GetOrCreateModule(ModuleId.From(y.Id)),
                 LinkType = NexusModsModToModuleLinkType.ByUnverifiedFileExposure,
-                LastUpdateDate = DateTime.UtcNow
-            }).ToList();
-            _dbContextWrite.FutureUpsert(x => x.NexusModsModModules, entities);
+                LastUpdateDate = DateTimeOffset.UtcNow
+            }).ToArray();
+            await _dbContextWrite.NexusModsModModules.UpsertOnSaveAsync(entities);
         }
 
         var nexusModsModToName = new NexusModsModToNameEntity
@@ -200,7 +190,7 @@ public NexusModsUserController(ILogger<NexusModsUserController> logger, NexusMod
             NexusModsMod = entityFactory.GetOrCreateNexusModsMod(query.NexusModsModId),
             Name = modInfo.Name,
         };
-        _dbContextWrite.FutureUpsert(x => x.NexusModsModName, nexusModsModToName);
+        await _dbContextWrite.NexusModsModName.UpsertOnSaveAsync(nexusModsModToName);
         var nexusModsUserToNexusModsMod = new NexusModsUserToNexusModsModEntity
         {
             TenantId = tenant,
@@ -208,16 +198,14 @@ public NexusModsUserController(ILogger<NexusModsUserController> logger, NexusMod
             NexusModsMod = entityFactory.GetOrCreateNexusModsMod(query.NexusModsModId),
             LinkType = NexusModsUserToNexusModsModLinkType.ByAPIConfirmation,
         };
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToNexusModsMods, nexusModsUserToNexusModsMod);
+        await _dbContextWrite.NexusModsUserToNexusModsMods.UpsertOnSaveAsync(nexusModsUserToNexusModsMod);
         return APIResponse("Linked successful!");
     }
 
     [HttpGet("ToNexusModsModUnlink")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToNexusModsModUnlinkAsync([FromQuery] NexusModsUserToNexusModsModQuery query)
+    public async Task<APIResponseActionResult<string?>> ToNexusModsModUnlinkAsync([FromQuery] NexusModsUserToNexusModsModQuery query, [BindUserId] NexusModsUserId userId)
     {
-        var userId = HttpContext.GetUserId();
-
         await _dbContextWrite.NexusModsUserToNexusModsMods
             .Where(x => x.NexusModsUser.NexusModsUserId == userId && x.NexusModsMod.NexusModsModId == query.NexusModsModId && x.LinkType == NexusModsUserToNexusModsModLinkType.ByOwner)
             .ExecuteDeleteAsync();
@@ -226,16 +214,13 @@ await _dbContextWrite.NexusModsUserToNexusModsMods
 
 
     [HttpGet("ToModuleManualLink")]
-    [Authorize(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
+    [ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToModuleManualLinkAsync([FromQuery] NexusModsUserToModuleQuery query)
+    public async Task<APIResponseActionResult<string?>> ToModuleManualLinkAsync([FromQuery] NexusModsUserToModuleQuery query, [BindTenant] TenantId tenant)
     {
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
         var entityFactory = _dbContextWrite.GetEntityFactory();
 
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None) return BadRequest();
-
         var nexusModsUserToModule = new NexusModsUserToModuleEntity
         {
             TenantId = tenant,
@@ -243,25 +228,25 @@ await _dbContextWrite.NexusModsUserToNexusModsMods
             Module = entityFactory.GetOrCreateModule(query.ModuleId),
             LinkType = NexusModsUserToModuleLinkType.ByStaff,
         };
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToModules, nexusModsUserToModule);
+        await _dbContextWrite.NexusModsUserToModules.UpsertOnSaveAsync(nexusModsUserToModule);
         return APIResponse("Allowed successful!");
     }
 
     [HttpGet("ToModuleManualUnlink")]
-    [Authorize(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
+    [ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToModuleManualUnlinkAsync([FromQuery] NexusModsUserToModuleQuery query)
+    public async Task<APIResponseActionResult<string?>> ToModuleManualUnlinkAsync([FromQuery] NexusModsUserToModuleQuery query)
     {
         await _dbContextWrite.NexusModsUserToModules
             .Where(x => x.NexusModsUser.NexusModsUserId == query.NexusModsUserId && x.Module.ModuleId == query.ModuleId && x.LinkType == NexusModsUserToModuleLinkType.ByStaff)
-            .DeleteFromQueryAsync();
+            .ExecuteDeleteAsync();
         return APIResponse("Disallowed successful!");
     }
 
     [HttpPost("ToModuleManualLinkPaginated")]
-    [Authorize(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
+    [ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator},{ApplicationRoles.Moderator}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<NexusModsUserToModuleManualLinkModel>?>>> ToModuleManualLinkPaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<NexusModsUserToModuleManualLinkModel>?>> ToModuleManualLinkPaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
     {
         var paginated = await _dbContextRead.NexusModsUserToModules
             .Where(x => x.LinkType == NexusModsUserToModuleLinkType.ByStaff)
@@ -275,16 +260,11 @@ await _dbContextWrite.NexusModsUserToModules
 
     [HttpGet("ToNexusModsModManualLink")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToNexusModsModManualLinkAsync([FromQuery] NexusModsUserToNexusModsModManualLinkQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> ToNexusModsModManualLinkAsync([FromQuery] NexusModsUserToNexusModsModManualLinkQuery query, [BindApiKey] NexusModsApiKey apiKey, [BindUserId] NexusModsUserId userId, [BindTenant] TenantId tenant, CancellationToken ct)
     {
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
         var entityFactory = _dbContextWrite.GetEntityFactory();
 
-        var userId = HttpContext.GetUserId();
-        var apiKey = HttpContext.GetAPIKey();
-        var tenant = HttpContext.GetTenant();
-        if (tenant == TenantId.None) return BadRequest();
-
         var gameDomain = tenant.ToGameDomain();
 
         if (await _nexusModsAPIClient.GetModAsync(gameDomain, query.NexusModsModId, apiKey, ct) is not { } modInfo)
@@ -300,8 +280,8 @@ await _dbContextWrite.NexusModsUserToModules
             NexusModsMod = entityFactory.GetOrCreateNexusModsMod(query.NexusModsModId),
             Name = modInfo.Name,
         };
-        _dbContextWrite.FutureUpsert(x => x.NexusModsModName, nexusModsModToName);
-        var nexusModsUserToNexusModsMods = new List<NexusModsUserToNexusModsModEntity>
+        await _dbContextWrite.NexusModsModName.UpsertOnSaveAsync(nexusModsModToName);
+        var nexusModsUserToNexusModsMods = new NexusModsUserToNexusModsModEntity[]
         {
             new()
             {
@@ -318,13 +298,13 @@ await _dbContextWrite.NexusModsUserToModules
                 LinkType = NexusModsUserToNexusModsModLinkType.ByOwner,
             }
         };
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToNexusModsMods, nexusModsUserToNexusModsMods);
+        await _dbContextWrite.NexusModsUserToNexusModsMods.UpsertOnSaveAsync(nexusModsUserToNexusModsMods);
         return APIResponse("Allowed successful!");
     }
 
     [HttpGet("ToNexusModsModManualUnlink")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> ToNexusModsModManualUnlinkAsync([FromQuery] NexusModsUserToNexusModsModManualLinkQuery query)
+    public async Task<APIResponseActionResult<string?>> ToNexusModsModManualUnlinkAsync([FromQuery] NexusModsUserToNexusModsModManualLinkQuery query)
     {
         await _dbContextWrite.NexusModsUserToNexusModsMods
             .Where(x => x.NexusModsUser.NexusModsUserId == query.NexusModsUserId && x.NexusModsMod.NexusModsModId == query.NexusModsModId && x.LinkType == NexusModsUserToNexusModsModLinkType.ByOwner)
@@ -334,10 +314,8 @@ await _dbContextWrite.NexusModsUserToNexusModsMods
 
     [HttpPost("ToNexusModsModManualLinkPaginated")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<NexusModsUserToNexusModsModManualLinkModel>?>>> ToNexusModsModManualLinkPaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<NexusModsUserToNexusModsModManualLinkModel>?>> ToNexusModsModManualLinkPaginatedAsync([FromBody] PaginatedQuery query, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var userId = HttpContext.GetUserId();
-
         var paginated = await _dbContextRead.NexusModsUserToNexusModsMods
             .Where(x => x.NexusModsUser.NexusModsUserId == userId && x.LinkType == NexusModsUserToNexusModsModLinkType.ByOwner)
             .GroupBy(x =>  new { NexusModsModId = x.NexusModsMod.NexusModsModId })
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/QuartzController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/QuartzController.cs
index 79f0c792..bec1d985 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/QuartzController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/QuartzController.cs
@@ -4,6 +4,9 @@
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
 using Microsoft.AspNetCore.Authorization;
@@ -20,7 +23,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme, Roles = $"{ApplicationRoles.Administrator}")]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization(Roles = $"{ApplicationRoles.Administrator}"), TenantNotRequired]
 public sealed class QuartzController : ControllerExtended
 {
     private readonly ILogger _logger;
@@ -38,10 +41,9 @@ public QuartzController(ILogger<QuartzController> logger, IAppDbContextRead dbCo
 
     [HttpPost("HistoryPaginated")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<PagingData<QuartzExecutionLogEntity>?>>> HistoryPaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
+    public async Task<APIResponseActionResult<PagingData<QuartzExecutionLogEntity>?>> HistoryPaginatedAsync([FromBody] PaginatedQuery query, CancellationToken ct)
     {
         var paginated = await _dbContextRead.QuartzExecutionLogs.Prepare()
-            .Where(x => x.LogType == QuartzLogType.ScheduleJob)
             .PaginatedAsync(query, 100, new() { Property = nameof(QuartzExecutionLogEntity.DateAddedUtc), Type = SortingType.Descending }, ct);
 
         return APIPagingResponse(paginated);
@@ -49,7 +51,7 @@ public QuartzController(ILogger<QuartzController> logger, IAppDbContextRead dbCo
 
     [HttpGet("Delete")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> DeleteAsync([FromQuery] long logId)
+    public async Task<APIResponseActionResult<string?>> DeleteAsync([FromQuery] long logId)
     {
         if (await _dbContextWrite.QuartzExecutionLogs.Where(x => x.LogId == logId).ExecuteDeleteAsync() > 0)
             return APIResponse("Deleted successful!");
@@ -59,9 +61,8 @@ public QuartzController(ILogger<QuartzController> logger, IAppDbContextRead dbCo
 
     [HttpGet("TriggerJob")]
     [Produces("application/json")]
-    public async Task<ActionResult> TriggerJobAsync(string jobId, CancellationToken ct)
+    public async Task<APIResponseActionResult<DateTimeOffset>> TriggerJobAsync(string jobId, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
-        var userId = HttpContext.GetUserId();
         var userName = HttpContext.GetName();
 
         var jobKey = JobKey.Create(jobId);
@@ -73,7 +74,6 @@ public async Task<ActionResult> TriggerJobAsync(string jobId, CancellationToken
 
         var scheduler = await _schedulerFactory.GetScheduler(ct);
         var startTime = await scheduler.ScheduleJob(trigger, CancellationToken.None);
-
-        return Ok();
+        return APIResponse(startTime);
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/RecreateStacktraceController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/RecreateStacktraceController.cs
index 2390a1d0..02638249 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/RecreateStacktraceController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/RecreateStacktraceController.cs
@@ -39,7 +39,7 @@ public RecreateStacktraceController(ILogger<RecreateStacktraceController> logger
 
     [HttpGet("Json/{id}")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<IEnumerable<RecreatedStacktrace>?>>> JsonAsync(CrashReportFileId id, CancellationToken ct)
+    public async Task<APIActionResult<IEnumerable<RecreatedStacktrace>?>> JsonAsync(CrashReportFileId id, CancellationToken ct)
     {
         if (!HttpContext.OwnsTenantGame())
             return Unauthorized();
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/ReportsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/ReportsController.cs
index b8b735c5..8fe2d833 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/ReportsController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/ReportsController.cs
@@ -1,6 +1,8 @@
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Services;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -12,7 +14,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), AllowAnonymous]
+[ApiController, Route("api/v1/[controller]"), AllowAnonymous, TenantRequired]
 public sealed class ReportsController : ControllerExtended
 {
     private readonly ILogger _logger;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/StatisticsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/StatisticsController.cs
index 1a4a17f9..0ff0f99e 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/StatisticsController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/StatisticsController.cs
@@ -2,8 +2,10 @@
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
-using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -18,7 +20,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantRequired]
 public sealed class StatisticsController : ControllerExtended
 {
     public record TopExceptionsEntry(ExceptionTypeId Type, decimal Percentage);
@@ -61,21 +63,21 @@ public StatisticsController(ILogger<StatisticsController> logger, IAppDbContextR
 
     [HttpGet("AutocompleteGameVersion")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IQueryable<string>?>> AutocompleteGameVersion([FromQuery] GameVersion gameVersion)
+    public APIResponseActionResult<IQueryable<string>?> AutocompleteGameVersion([FromQuery] GameVersion gameVersion)
     {
         return APIResponse(_dbContextRead.AutocompleteStartsWith<CrashReportEntity, GameVersion>(x => x.GameVersion, gameVersion));
     }
 
     [HttpGet("AutocompleteModuleId")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IQueryable<string>?>> AutocompleteModuleId([FromQuery] ModuleId moduleId)
+    public APIResponseActionResult<IQueryable<string>?> AutocompleteModuleId([FromQuery] ModuleId moduleId)
     {
         return APIResponse(_dbContextRead.AutocompleteStartsWith<CrashReportToModuleMetadataEntity, ModuleId>(x => x.Module.ModuleId, moduleId));
     }
 
     [HttpGet("TopExceptionsTypes")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<IEnumerable<TopExceptionsEntry>?>>> TopExceptionsTypesAsync(CancellationToken ct)
+    public async Task<APIResponseActionResult<IEnumerable<TopExceptionsEntry>?>> TopExceptionsTypesAsync(CancellationToken ct)
     {
         var types = await _dbContextRead.StatisticsTopExceptionsTypes
             .Include(x => x.ExceptionType)
@@ -88,7 +90,7 @@ public StatisticsController(ILogger<StatisticsController> logger, IAppDbContextR
 
     [HttpGet("Involved")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<IQueryable<GameStorage>?>> Involved([FromQuery] GameVersion[]? gameVersions, [FromQuery] ModuleId[]? moduleIds, [FromQuery] ModuleVersion[]? moduleVersions)
+    public APIResponseActionResult<IQueryable<GameStorage>?> Involved([FromQuery] GameVersion[]? gameVersions, [FromQuery] ModuleId[]? moduleIds, [FromQuery] ModuleVersion[]? moduleVersions)
     {
         //if (gameVersions?.Length == 0 && modIds?.Length == 0 && modVersions?.Length == 0)
         //    return StatusCode(StatusCodes.Status403Forbidden, Array.Empty<GameStorage>());
@@ -114,10 +116,10 @@ public StatisticsController(ILogger<StatisticsController> logger, IAppDbContextR
                             Score = 1 - q.Score,
                             Value = q.RawValue,
                             CountStable = q.NotInvolvedCount,
-                            CountUnstable = q.InvolvedCount
-                        }).ToArray()
-                    }).ToArray()
-                }).ToArray()
+                            CountUnstable = q.InvolvedCount,
+                        }).ToArray(),
+                    }).ToArray(),
+                }).ToArray(),
             });
 
         return APIResponse(data);
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/SteamController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/SteamController.cs
index 5de60389..2fbac8c3 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/SteamController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/SteamController.cs
@@ -1,9 +1,11 @@
 using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
-using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Options;
 using BUTR.Site.NexusMods.Server.Services;
+using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
 using Microsoft.AspNetCore.Authorization;
@@ -19,7 +21,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Controllers;
 
-[ApiController, Route("api/v1/[controller]"), Authorize(AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme)]
+[ApiController, Route("api/v1/[controller]"), ButrNexusModsAuthorization, TenantNotRequired]
 public sealed class SteamController : ControllerExtended
 {
     public sealed record SteamOpenIdUrlModel(string Url);
@@ -40,16 +42,16 @@ public SteamController(ISteamStorage steamStorage, IOptions<SteamAPIOptions> opt
 
     [HttpGet("GetOpenIdUrl")]
     [Produces("application/json")]
-    public ActionResult<APIResponse<SteamOpenIdUrlModel?>> GetOpenIdUrl()
+    public APIResponseActionResult<SteamOpenIdUrlModel?> GetOpenIdUrl()
     {
-        var query = QueryString.Create(new KeyValuePair<string, string?>[]
+        var query = QueryString.Create(new Dictionary<string, string?>
         {
-            new("openid.ns", "http://specs.openid.net/auth/2.0"),
-            new("openid.mode", "checkid_setup"),
-            new("openid.return_to", _options.RedirectUri),
-            new("openid.realm", _options.Realm),
-            new("openid.identity", "http://specs.openid.net/auth/2.0/identifier_select"),
-            new("openid.claimed_id", "http://specs.openid.net/auth/2.0/identifier_select"),
+            ["openid.ns"] = "http://specs.openid.net/auth/2.0",
+            ["openid.mode"] = "checkid_setup",
+            ["openid.return_to"] = _options.RedirectUri,
+            ["openid.realm"] = _options.Realm,
+            ["openid.identity"] = "http://specs.openid.net/auth/2.0/identifier_select",
+            ["openid.claimed_id"] = "http://specs.openid.net/auth/2.0/identifier_select",
         });
         var steamLoginUrl = new UriBuilder("https://steamcommunity.com/openid/login") { Query = query.ToUriComponent() };
 
@@ -58,7 +60,7 @@ public SteamController(ISteamStorage steamStorage, IOptions<SteamAPIOptions> opt
 
     [HttpGet("Link")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> LinkAsync([FromQuery] Dictionary<string, string> _, CancellationToken ct)
+    public async Task<APIResponseActionResult<string?>> LinkAsync([FromQuery] Dictionary<string, string> _, [BindUserId] NexusModsUserId userId, CancellationToken ct)
     {
         var queries = HttpContext.Request.Query.ToDictionary(x => x.Key, x => x.Value[0] ?? string.Empty);
 
@@ -69,7 +71,6 @@ public SteamController(ISteamStorage steamStorage, IOptions<SteamAPIOptions> opt
         if (!SteamUtils.TryParse(queries["openid.claimed_id"], out var steamId))
             return APIResponseError<string>("Failed to link!");
 
-        var userId = HttpContext.GetUserId();
         var userInfo = await _steamAPIClient.GetUserInfoAsync(steamId, ct);
 
         if (!await _steamStorage.CheckOwnedGamesAsync(userId, steamId))
@@ -83,9 +84,8 @@ public SteamController(ISteamStorage steamStorage, IOptions<SteamAPIOptions> opt
 
     [HttpPost("Unlink")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<string?>>> UnlinkAsync()
+    public async Task<APIResponseActionResult<string?>> UnlinkAsync([BindUserId] NexusModsUserId userId)
     {
-        var userId = HttpContext.GetUserId();
         var tokens = HttpContext.GetSteamTokens();
 
         if (tokens?.Data is null)
@@ -99,7 +99,7 @@ public SteamController(ISteamStorage steamStorage, IOptions<SteamAPIOptions> opt
 
     [HttpPost("GetUserInfo")]
     [Produces("application/json")]
-    public async Task<ActionResult<APIResponse<SteamUserInfo?>>> GetUserInfoByAccessTokenAsync(CancellationToken ct)
+    public async Task<APIResponseActionResult<SteamUserInfo?>> GetUserInfoByAccessTokenAsync(CancellationToken ct)
     {
         var tokens = HttpContext.GetSteamTokens();
 
diff --git a/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicExpressions.cs b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicExpressions.cs
new file mode 100644
index 00000000..39050681
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicExpressions.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace BUTR.Site.NexusMods.Server.DynamicExpressions;
+
+public static class DynamicExpressions
+{
+    private static readonly MethodInfo _toStringMethod = typeof(object).GetMethod("ToString")!;
+
+    private static readonly MethodInfo _stringContainsMethod = typeof(string).GetMethod("Contains", new[] { typeof(string) })!;
+    private static readonly MethodInfo _stringContainsMethodIgnoreCase = typeof(string).GetMethod("Contains", new[] { typeof(string), typeof(StringComparison) })!;
+    private static readonly MethodInfo _enumerableContainsMethod = typeof(Enumerable).GetMethods().Where(x => string.Equals(x.Name, "Contains", StringComparison.OrdinalIgnoreCase)).Single(x => x.GetParameters().Length == 2).MakeGenericMethod(typeof(string));
+    private static readonly MethodInfo _dictionaryContainsKeyMethod = typeof(Dictionary<string, string>).GetMethods().Single(x => string.Equals(x.Name, "ContainsKey", StringComparison.OrdinalIgnoreCase));
+    private static readonly MethodInfo _dictionaryContainsValueMethod = typeof(Dictionary<string, string>).GetMethods().Single(x => string.Equals(x.Name, "ContainsValue", StringComparison.OrdinalIgnoreCase));
+    
+    private static readonly MethodInfo _endsWithMethod = typeof(string).GetMethod("EndsWith", new[] { typeof(string) })!;
+    private static readonly MethodInfo _isNullOrEmtpyMethod = typeof(string).GetMethod("IsNullOrEmpty", new[] { typeof(string) })!;
+    private static readonly MethodInfo _startsWithMethod = typeof(string).GetMethod("StartsWith", new[] { typeof(string) })!;
+
+    public static Expression<Func<TEntity, bool>> GetPredicate<TEntity>(string property, FilterOperator op, object value)
+    {
+        var param = Expression.Parameter(typeof(TEntity));
+        return Expression.Lambda<Func<TEntity, bool>>(GetFilter(param, property, op, value), param);
+    }
+
+    public static Expression<Func<TEntity, object>> GetPropertyGetter<TEntity>(string property)
+    {
+        if (property == null)
+            throw new ArgumentNullException(nameof(property));
+
+        var param = Expression.Parameter(typeof(TEntity));
+        var prop = param.GetNestedProperty(property);
+        var convertedProp = Expression.Convert(prop, typeof(object));
+        return Expression.Lambda<Func<TEntity, object>>(convertedProp, param);
+    }
+
+    internal static Expression GetFilter(ParameterExpression param, string property, FilterOperator op, object value)
+    {
+        var constant = Expression.Constant(value);
+        var prop = param.GetNestedProperty(property);
+        return CreateFilter(prop, op, constant);
+    }
+
+    private static Expression CreateFilter(MemberExpression prop, FilterOperator op, ConstantExpression constant)
+    {
+        return op switch
+        {
+            FilterOperator.Equals => RobustEquals(prop, constant),
+            FilterOperator.GreaterThan => Expression.GreaterThan(prop, constant),
+            FilterOperator.LessThan => Expression.LessThan(prop, constant),
+            FilterOperator.ContainsIgnoreCase => Expression.Call(AsString(prop), _stringContainsMethodIgnoreCase, AsString(constant), Expression.Constant(StringComparison.OrdinalIgnoreCase)),
+            FilterOperator.Contains => GetContainsMethodCallExpression(prop, constant),
+            FilterOperator.NotContains => Expression.Not(GetContainsMethodCallExpression(prop, constant)),
+            FilterOperator.ContainsKey => Expression.Call(prop, _dictionaryContainsKeyMethod, AsString(constant)),
+            FilterOperator.NotContainsKey => Expression.Not(Expression.Call(prop, _dictionaryContainsKeyMethod, AsString(constant))),
+            FilterOperator.ContainsValue => Expression.Call(prop, _dictionaryContainsValueMethod, AsString(constant)),
+            FilterOperator.NotContainsValue => Expression.Not(Expression.Call(prop, _dictionaryContainsValueMethod, AsString(constant))),
+            FilterOperator.StartsWith => Expression.Call(AsString(prop), _startsWithMethod, AsString(constant)),
+            FilterOperator.EndsWith => Expression.Call(AsString(prop), _endsWithMethod, AsString(constant)),
+            FilterOperator.DoesntEqual => Expression.Not(RobustEquals(prop, constant)),
+            FilterOperator.GreaterThanOrEqual => Expression.GreaterThanOrEqual(prop, constant),
+            FilterOperator.LessThanOrEqual => Expression.LessThanOrEqual(prop, constant),
+            FilterOperator.IsEmpty => Expression.Call(_isNullOrEmtpyMethod, AsString(prop)),
+            FilterOperator.IsNotEmpty => Expression.Not(Expression.Call(_isNullOrEmtpyMethod, AsString(prop))),
+            _ => throw new NotImplementedException()
+        };
+    }
+
+    private static Expression RobustEquals(MemberExpression prop, ConstantExpression constant)
+    {
+        if (prop.Type == typeof(bool) && bool.TryParse(constant.Value?.ToString(), out var val))
+        {
+            return Expression.Equal(prop, Expression.Constant(val));
+        }
+
+        if (constant.Value is { } value && TypeDescriptor.GetConverter(prop.Type) is { } typeConverter && typeConverter.CanConvertFrom(value.GetType()))
+        {
+            return Expression.Equal(prop, Expression.Convert(constant, prop.Type));
+        }
+        
+        return Expression.Equal(prop, constant);
+    }
+
+    private static Expression GetContainsMethodCallExpression(MemberExpression prop, ConstantExpression constant)
+    {
+        if (prop.Type == typeof(string)) // Check if it's convertible to string
+            return Expression.Call(prop, _stringContainsMethod, AsString(constant));
+        else if (prop.Type.GetInterfaces().Contains(typeof(IDictionary)))
+            return Expression.Or(Expression.Call(prop, _dictionaryContainsKeyMethod, AsString(constant)), Expression.Call(prop, _dictionaryContainsValueMethod, AsString(constant)));
+        else if (prop.Type.GetInterfaces().Contains(typeof(IEnumerable)))
+            return Expression.Call(_enumerableContainsMethod, prop, AsString(constant));
+
+        throw new NotImplementedException($"{prop.Type} contains is not implemented.");
+    }
+    
+    private static Expression AsString(Expression constant)
+    {
+        if (constant.Type == typeof(string))
+            return constant;
+        
+        if (TypeDescriptor.GetConverter(constant.Type) is { } typeConverter && typeConverter.CanConvertTo(typeof(string))) 
+            return Expression.Convert(constant, typeof(string));
+        
+        var convertedExpr = Expression.Convert(constant, typeof(object));
+        return Expression.Call(convertedExpr, _toStringMethod);
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicFilterBuilder.cs b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicFilterBuilder.cs
new file mode 100644
index 00000000..5060bf6b
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicFilterBuilder.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Linq.Expressions;
+
+namespace BUTR.Site.NexusMods.Server.DynamicExpressions;
+
+public class DynamicFilterBuilder<TEntity>
+{
+    private Expression? Expression { get; set; }
+
+    private readonly ParameterExpression _param;
+
+    public DynamicFilterBuilder() : this(Expression.Parameter(typeof(TEntity))) { }
+    private DynamicFilterBuilder(ParameterExpression param) { _param = param; }
+
+    public DynamicFilterBuilder<TEntity> And(string property, FilterOperator op, object value)
+    {
+        var newExpr = DynamicExpressions.GetFilter(_param, property, op, value);
+        Expression = Expression == null ? newExpr : Expression.AndAlso(Expression, newExpr);
+        return this;
+    }
+
+    public DynamicFilterBuilder<TEntity> And(Action<DynamicFilterBuilder<TEntity>> action)
+    {
+        var builder = new DynamicFilterBuilder<TEntity>(_param);
+        action(builder);
+
+        if (builder.Expression == null)
+            throw new Exception("Empty builder");
+
+        Expression = Expression == null ? builder.Expression : Expression.AndAlso(Expression, builder.Expression);
+        return this;
+    }
+
+    public DynamicFilterBuilder<TEntity> Or(string property, FilterOperator op, object value)
+    {
+        var newExpr = DynamicExpressions.GetFilter(_param, property, op, value);
+        Expression = Expression == null ? newExpr : Expression.OrElse(Expression, newExpr);
+        return this;
+    }
+
+    public DynamicFilterBuilder<TEntity> Or(Action<DynamicFilterBuilder<TEntity>> action)
+    {
+        var builder = new DynamicFilterBuilder<TEntity>(_param);
+        action(builder);
+
+        if (builder.Expression == null)
+            throw new Exception("Empty builder");
+
+        Expression = Expression == null ? builder.Expression : Expression.OrElse(Expression, builder.Expression);
+        return this;
+    }
+
+    public Expression<Func<TEntity, bool>> Build()
+    {
+        return Expression.Lambda<Func<TEntity, bool>>(Expression, _param);
+    }
+
+    public Func<TEntity, bool> Compile() => Build().Compile();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/DynamicExpressions/ExpressionExtensions.cs b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/ExpressionExtensions.cs
new file mode 100644
index 00000000..b6c40bb3
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/ExpressionExtensions.cs
@@ -0,0 +1,19 @@
+using System.Linq.Expressions;
+
+namespace BUTR.Site.NexusMods.Server.DynamicExpressions;
+
+public static class ExpressionExtensions
+{
+    internal static MemberExpression GetNestedProperty(this Expression param, string property)
+    {
+        var propNames = property.Split('.');
+        var propExpr = Expression.Property(param, propNames[0]);
+
+        for (var i = 1; i < propNames.Length; i++)
+        {
+            propExpr = Expression.Property(propExpr, propNames[i]);
+        }
+
+        return propExpr;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/DynamicExpressions/FilterOperator.cs b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/FilterOperator.cs
new file mode 100644
index 00000000..97d725b1
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/FilterOperator.cs
@@ -0,0 +1,22 @@
+namespace BUTR.Site.NexusMods.Server.DynamicExpressions;
+
+public enum FilterOperator
+{
+    Equals,
+    DoesntEqual,
+    GreaterThan,
+    GreaterThanOrEqual,
+    LessThan,
+    LessThanOrEqual,
+    Contains,
+    NotContains,
+    StartsWith,
+    EndsWith,
+    ContainsIgnoreCase,
+    IsEmpty,
+    IsNotEmpty,
+    ContainsKey,
+    NotContainsKey,
+    ContainsValue,
+    NotContainsValue
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Extensions/DbSetExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/DbSetExtensions.cs
new file mode 100644
index 00000000..60a6a988
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Extensions/DbSetExtensions.cs
@@ -0,0 +1,73 @@
+using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Models.Database;
+
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Extensions;
+
+public static class DbSetExtensions
+{
+    public static async Task UpsertOnSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        if (dbSet.GetService<ICurrentDbContext>().Context is IAppDbContextWrite dbContext)
+            await dbContext.BulkUpsertAsync(dbSet, entities);
+    }
+    public static async Task UpsertOnSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IAsyncEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        if (dbSet.GetService<ICurrentDbContext>().Context is IAppDbContextWrite dbContext)
+            await dbContext.BulkUpsertAsync(dbSet, entities);
+    }
+    public static async Task UpsertOnSaveAsync<TEntity>(this DbSet<TEntity> dbSet, params TEntity[] entities) where TEntity : class, IEntity
+    {
+        if (dbSet.GetService<ICurrentDbContext>().Context is IAppDbContextWrite dbContext)
+            await dbContext.BulkUpsertAsync(dbSet, entities);
+    }
+
+    public static async Task SynchronizeOnSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        if (dbSet.GetService<ICurrentDbContext>().Context is IAppDbContextWrite dbContext)
+            await dbContext.BulkSynchronizeAsync(dbSet, entities);
+    }
+    public static async Task SynchronizeOnSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IAsyncEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        if (dbSet.GetService<ICurrentDbContext>().Context is IAppDbContextWrite dbContext)
+            await dbContext.BulkSynchronizeAsync(dbSet, entities);
+    }
+    public static async Task SynchronizeOnSaveAsync<TEntity>(this DbSet<TEntity> dbSet, params TEntity[] entities) where TEntity : class, IEntity
+    {
+        if (dbSet.GetService<ICurrentDbContext>().Context is IAppDbContextWrite dbContext)
+            await dbContext.BulkSynchronizeAsync(dbSet, entities);
+    }
+
+
+    public static async Task UpsertAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        await dbSet.BulkMergeAsync(entities);
+    }
+    public static async Task UpsertAsync<TEntity>(this DbSet<TEntity> dbSet, IAsyncEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        await dbSet.BulkMergeAsync(await entities.ToArrayAsync());
+    }
+    public static async Task UpsertAsync<TEntity>(this DbSet<TEntity> dbSet, params TEntity[] entities) where TEntity : class, IEntity
+    {
+        await dbSet.BulkMergeAsync(entities);
+    }
+
+    public static async Task SynchronizeAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        await dbSet.BulkSynchronizeAsync(entities);
+    }
+    public static async Task SynchronizeAsync<TEntity>(this DbSet<TEntity> dbSet, IAsyncEnumerable<TEntity> entities) where TEntity : class, IEntity
+    {
+        await dbSet.BulkSynchronizeAsync(await entities.ToArrayAsync());
+    }
+    public static async Task SynchronizeAsync<TEntity>(this DbSet<TEntity> dbSet, params TEntity[] entities) where TEntity : class, IEntity
+    {
+        await dbSet.BulkSynchronizeAsync(entities);
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Extensions/HttpContextExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/HttpContextExtensions.cs
index 238cb7df..45dfb919 100644
--- a/src/BUTR.Site.NexusMods.Server/Extensions/HttpContextExtensions.cs
+++ b/src/BUTR.Site.NexusMods.Server/Extensions/HttpContextExtensions.cs
@@ -34,7 +34,11 @@ public static ProfileModel GetProfile(this HttpContext context, NexusModsValidat
             GOGUserId = GetGOGId(metadata, jsonSerializerOptions),
             SteamUserId = GetSteamId(metadata, jsonSerializerOptions),
             HasTenantGame = context.OwnsTenantGame(context.GetTenant()),
-            AvailableTenants = TenantId.Values.ToImmutableDictionary(x => x, x => x.ToName()),
+            AvailableTenants = TenantId.Values.Select(x => new ProfileTenantModel
+            {
+                TenantId = x,
+                Name = x.ToName(),
+            }).ToImmutableArray(),
         };
     }
 
@@ -55,7 +59,11 @@ public static ProfileModel GetProfile(this HttpContext context)
             GOGUserId = GetGOGId(context.GetMetadata(), jsonSerializerOptions),
             SteamUserId = GetSteamId(context.GetMetadata(), jsonSerializerOptions),
             HasTenantGame = context.OwnsTenantGame(context.GetTenant()),
-            AvailableTenants = TenantId.Values.ToImmutableDictionary(x => x, x => x.ToName()),
+            AvailableTenants = TenantId.Values.Select(x => new ProfileTenantModel
+            {
+                TenantId = x,
+                Name = x.ToName(),
+            }).ToImmutableArray(),
         };
     }
 
diff --git a/src/BUTR.Site.NexusMods.Server/Extensions/JobExecutionContextExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/JobExecutionContextExtensions.cs
index 1e049188..41655f8e 100644
--- a/src/BUTR.Site.NexusMods.Server/Extensions/JobExecutionContextExtensions.cs
+++ b/src/BUTR.Site.NexusMods.Server/Extensions/JobExecutionContextExtensions.cs
@@ -1,10 +1,10 @@
 using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.Quartz;
 
 using Quartz;
 
 using System;
 using System.Globalization;
-using System.Text;
 
 namespace BUTR.Site.NexusMods.Server.Extensions;
 
@@ -37,43 +37,18 @@ public static IJobExecutionContext SetIsSuccess(this IJobExecutionContext contex
     public static string? GetReturnCode(this IJobExecutionContext context)
     {
         var val = context.Get(JobDataMapKeys.ReturnCode);
-        if (val != null)
-            return Convert.ToString(val, CultureInfo.InvariantCulture);
-        return null;
+        return val != null ? Convert.ToString(val, CultureInfo.InvariantCulture) : null;
     }
 
     public static string? GetExecutionDetails(this IJobExecutionContext context)
     {
         var val = context.Get(JobDataMapKeys.ExecutionDetails);
-        if (val != null)
-            return Convert.ToString(val, CultureInfo.InvariantCulture);
-
-        return null;
+        return val != null ? Convert.ToString(val, CultureInfo.InvariantCulture) : null;
     }
 
     public static bool? GetIsSuccess(this IJobExecutionContext context)
     {
-        var value = context.Get(JobDataMapKeys.IsSuccess);
-        if (value == null)
-            return null;
-        return Convert.ToBoolean(value);
-    }
-
-    public static string? GetReturnCodeAndResult(this IJobExecutionContext context)
-    {
-        var returnCode = context.GetReturnCode();
-        var strBldr = new StringBuilder();
-        if (!string.IsNullOrEmpty(returnCode))
-        {
-            strBldr.Append($"Return {returnCode}. ");
-        }
-
-        var result = context.Result?.ToString();
-        if (!string.IsNullOrEmpty(result))
-        {
-            strBldr.Append(result);
-        }
-
-        return strBldr.ToString();
+        var val = context.Get(JobDataMapKeys.IsSuccess);
+        return val == null ? null : Convert.ToBoolean(val);
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Extensions/QueryableExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/QueryableExtensions.cs
index 6c7c832a..e2d5a1c7 100644
--- a/src/BUTR.Site.NexusMods.Server/Extensions/QueryableExtensions.cs
+++ b/src/BUTR.Site.NexusMods.Server/Extensions/QueryableExtensions.cs
@@ -1,9 +1,9 @@
-using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.DynamicExpressions;
+using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Models.Database;
 using BUTR.Site.NexusMods.Server.Utils.Npgsql;
-
-using DynamicExpressions;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
@@ -12,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
@@ -107,6 +108,12 @@ public static Task<ImmutableArray<TSource>> ToImmutableArrayAsync<TSource>(this
 
     private static bool TryConvertValue(Type type, string rawValue, [NotNullWhen((true))] out object? value)
     {
+        if (type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IVogen<,>)) is { } vogen)
+        {
+            if (vogen.GetGenericArguments() is [_, { } valueObject])
+                type = valueObject;
+        }
+        
         if (type.IsEnum)
             return Enum.TryParse(type, rawValue, out value);
 
@@ -206,11 +213,24 @@ private static bool TryConvertValue(Type type, string rawValue, [NotNullWhen((tr
                 value = DateTime.SpecifyKind(val, DateTimeKind.Utc);
                 return result;
             }
-            default:
-            {
-                value = null;
-                return false;
-            }
+        }
+
+        var typeConverter = TypeDescriptor.GetConverter(type);
+        if (typeConverter.CanConvertFrom(typeof(string)))
+        {
+            value = typeConverter.ConvertFrom(rawValue)!;
+            return true;
+        }
+        
+        try
+        {
+            value = System.Convert.ChangeType(rawValue, type);
+            return true;
+        }
+        catch (Exception)
+        {
+            value = null;
+            return false;
         }
     }
 
diff --git a/src/BUTR.Site.NexusMods.Server/Extensions/VogenExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/VogenExtensions.cs
new file mode 100644
index 00000000..941316c7
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Extensions/VogenExtensions.cs
@@ -0,0 +1,80 @@
+using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+using System;
+
+namespace BUTR.Site.NexusMods.Server.Extensions;
+
+public static class VogenExtensions
+{
+    private static PropertyBuilder<TVogen> HasVogenConversion<TVogen, TValueObject>(this PropertyBuilder<TVogen> propertyBuilder)
+        where TVogen : struct, IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
+        where TValueObject : notnull =>
+        propertyBuilder.HasConversion<VogenValueConverter<TVogen, TValueObject>, VogenValueComparer<TVogen, TValueObject>>();
+
+    private static PropertyBuilder<TNullable> HasVogenConversionNullable<TNullable, TVogen, TValueObject>(this PropertyBuilder<TNullable> propertyBuilder)
+        where TVogen : struct, IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
+        where TValueObject : notnull =>
+        propertyBuilder.HasConversion<VogenValueConverter<TVogen, TValueObject>, VogenValueComparer<TVogen, TValueObject>>();
+
+
+    public static PropertyBuilder<ApplicationRole> HasVogenConversion(this PropertyBuilder<ApplicationRole> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<ApplicationRole, string>();
+
+    public static PropertyBuilder<CrashReportFileId> HasVogenConversion(this PropertyBuilder<CrashReportFileId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<CrashReportFileId, string>();
+
+    public static PropertyBuilder<CrashReportId> HasVogenConversion(this PropertyBuilder<CrashReportId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<CrashReportId, Guid>();
+
+    public static PropertyBuilder<CrashReportUrl> HasVogenConversion(this PropertyBuilder<CrashReportUrl> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<CrashReportUrl, string>();
+
+    public static PropertyBuilder<CrashReportVersion> HasVogenConversion(this PropertyBuilder<CrashReportVersion> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<CrashReportVersion, byte>();
+
+    public static PropertyBuilder<ExceptionTypeId> HasVogenConversion(this PropertyBuilder<ExceptionTypeId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<ExceptionTypeId, string>();
+
+    public static PropertyBuilder<GameVersion> HasVogenConversion(this PropertyBuilder<GameVersion> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<GameVersion, string>();
+
+    public static PropertyBuilder<ModuleId> HasVogenConversion(this PropertyBuilder<ModuleId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<ModuleId, string>();
+
+    public static PropertyBuilder<ModuleVersion> HasVogenConversion(this PropertyBuilder<ModuleVersion> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<ModuleVersion, string>();
+
+    public static PropertyBuilder<NexusModsApiKey> HasVogenConversion(this PropertyBuilder<NexusModsApiKey> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<NexusModsApiKey, string>();
+
+    public static PropertyBuilder<NexusModsArticleId> HasVogenConversion(this PropertyBuilder<NexusModsArticleId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<NexusModsArticleId, int>();
+
+    public static PropertyBuilder<NexusModsFileId> HasVogenConversion(this PropertyBuilder<NexusModsFileId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<NexusModsFileId, int>();
+
+    public static PropertyBuilder<NexusModsGameDomain> HasVogenConversion(this PropertyBuilder<NexusModsGameDomain> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<NexusModsGameDomain, string>();
+
+    public static PropertyBuilder<NexusModsModId> HasVogenConversion(this PropertyBuilder<NexusModsModId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<NexusModsModId, int>();
+
+    public static PropertyBuilder<NexusModsUserEMail> HasVogenConversion(this PropertyBuilder<NexusModsUserEMail> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<NexusModsUserEMail, string>();
+
+    public static PropertyBuilder<NexusModsUserId> HasVogenConversion(this PropertyBuilder<NexusModsUserId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<NexusModsUserId, int>();
+
+    public static PropertyBuilder<NexusModsUserName> HasVogenConversion(this PropertyBuilder<NexusModsUserName> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<NexusModsUserName, string>();
+
+    public static PropertyBuilder<TenantId> HasVogenConversion(this PropertyBuilder<TenantId> propertyBuilder) =>
+        propertyBuilder.HasVogenConversion<TenantId, byte>();
+
+
+    public static PropertyBuilder<NexusModsModId?> HasVogenConversion(this PropertyBuilder<NexusModsModId?> propertyBuilder) =>
+        propertyBuilder.HasVogenConversionNullable<NexusModsModId?, NexusModsModId, int>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Jobs/AutocompleteProcessorProcessorJob.cs b/src/BUTR.Site.NexusMods.Server/Jobs/AutocompleteProcessorProcessorJob.cs
index 02cbdb53..c4e72bb5 100644
--- a/src/BUTR.Site.NexusMods.Server/Jobs/AutocompleteProcessorProcessorJob.cs
+++ b/src/BUTR.Site.NexusMods.Server/Jobs/AutocompleteProcessorProcessorJob.cs
@@ -36,7 +36,7 @@ private sealed record AutocompleteGroupingEntry(string Name, Func<IAppDbContextR
     {
         new(GenerateName<CrashReportEntity, GameVersion>(x => x.GameVersion), x => x.CrashReports.Select(y => y.GameVersion.Value)),
         new(GenerateName<CrashReportToModuleMetadataEntity, ModuleId>(x => x.Module.ModuleId), x => x.CrashReportModuleInfos.Select(y => y.Module.ModuleId.Value)),
-        new(GenerateName<NexusModsArticleEntity, NexusModsUserName>(x => x.NexusModsUser.Name!.Name), x => x.NexusModsArticles.Include(y => y.NexusModsUser).ThenInclude(y => y.Name).Select(y => y.NexusModsUser).Select(x => x.Name).Select(x => x.Name.Value)),
+        new(GenerateName<NexusModsArticleEntity, NexusModsUserName>(x => x.NexusModsUser.Name!.Name), x => x.NexusModsArticles.Include(y => y.NexusModsUser).ThenInclude(y => y.Name).Select(y => y.NexusModsUser).Select(y => y.Name!).Select(y => y.Name.Value)),
     };
 
     //private static readonly AutocompleteGroupingEntry[] ToAutocompleteGrouping =
@@ -90,12 +90,12 @@ private static async Task HandleTenantAsync(TenantId tenant, IServiceProvider se
             var key = autocompleteEntry.Name;
 
             await dbContextWrite.Autocompletes.Where(x => x.Type == key).ExecuteDeleteAsync(ct);
-            await dbContextWrite.Autocompletes.BulkInsertAsync(autocompleteEntry.Query(dbContextRead).Distinct().Select(x => new AutocompleteEntity
+            await dbContextWrite.Autocompletes.UpsertAsync(autocompleteEntry.Query(dbContextRead).Distinct().Select(x => new AutocompleteEntity
             {
                 TenantId = tenant,
                 Type = key,
                 Value = x,
-            }), ct);
+            }));
         }
 
         /*
diff --git a/src/BUTR.Site.NexusMods.Server/Jobs/CrashReportAnalyzerProcessorJob.cs b/src/BUTR.Site.NexusMods.Server/Jobs/CrashReportAnalyzerProcessorJob.cs
index 74f36b3f..a88a99d8 100644
--- a/src/BUTR.Site.NexusMods.Server/Jobs/CrashReportAnalyzerProcessorJob.cs
+++ b/src/BUTR.Site.NexusMods.Server/Jobs/CrashReportAnalyzerProcessorJob.cs
@@ -60,7 +60,7 @@ private static async Task HandleTenantAsync(TenantId tenant, IServiceProvider se
         var dbContextRead = serviceProvider.GetRequiredService<IAppDbContextRead>();
         var dbContextWrite = serviceProvider.GetRequiredService<IAppDbContextWrite>();
         var entityFactory = dbContextWrite.GetEntityFactory();
-        await using var _ = dbContextWrite.CreateSaveScope();
+        await using var _ = await dbContextWrite.CreateSaveScopeAsync();
 
         var allModVersionsQuery = dbContextRead.CrashReportModuleInfos
             .GroupBy(x => new { x.Module.ModuleId, x.Version })
@@ -116,9 +116,9 @@ from allModVersios in allModVersionsQuery
             TotalCount = x.TotalCount,
             RawValue = x.Value,
             Score = x.CrashScore,
-        }).ToListAsync(ct);
+        }).ToArrayAsync(ct);
 
-        dbContextWrite.FutureSyncronize(x => x.StatisticsCrashScoreInvolveds, statisticsCrashScoreInvolved);
+        await dbContextWrite.StatisticsCrashScoreInvolveds.SynchronizeOnSaveAsync(statisticsCrashScoreInvolved);
         // Disposing the DBContext will save the data
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Jobs/CrashReportProcessorJob.cs b/src/BUTR.Site.NexusMods.Server/Jobs/CrashReportProcessorJob.cs
index f83beaf7..e6be04c4 100644
--- a/src/BUTR.Site.NexusMods.Server/Jobs/CrashReportProcessorJob.cs
+++ b/src/BUTR.Site.NexusMods.Server/Jobs/CrashReportProcessorJob.cs
@@ -1,24 +1,15 @@
-using BUTR.CrashReport.Bannerlord.Parser;
-using BUTR.CrashReport.Models;
-using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
-using BUTR.Site.NexusMods.Server.Models.Database;
-using BUTR.Site.NexusMods.Server.Options;
 using BUTR.Site.NexusMods.Server.Services;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 using Quartz;
 
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Channels;
 using System.Threading.Tasks;
 
 namespace BUTR.Site.NexusMods.Server.Jobs;
@@ -26,26 +17,6 @@ namespace BUTR.Site.NexusMods.Server.Jobs;
 [DisallowConcurrentExecution]
 public sealed class CrashReportProcessorJob : IJob
 {
-    private class ObjectPool<T>
-    {
-        private readonly ConcurrentBag<T> _objects = new();
-        private readonly Func<CancellationToken, Task<T>> _objectGenerator;
-
-        public ObjectPool(Func<CancellationToken, Task<T>> objectGenerator)
-        {
-            _objectGenerator = objectGenerator ?? throw new ArgumentNullException(nameof(objectGenerator));
-        }
-
-        public async Task<T> GetAsync(CancellationToken ct) => _objects.TryTake(out var item) ? item : await _objectGenerator(ct);
-
-        public void Return(T item) => _objects.Add(item);
-    }
-
-    private record HttpResultEntry(CrashReportFileId FileId, DateTime Date, CrashReportModel CrashReport);
-    private record DatabaseResultEntry(CrashReportFileId FileId, CrashReportModel CrashReport, DateTime Date);
-
-    private static readonly int ParallelCount = Environment.ProcessorCount / 2;
-
     private readonly ILogger _logger;
     private readonly IServiceScopeFactory _serviceScopeFactory;
 
@@ -55,273 +26,6 @@ public CrashReportProcessorJob(ILogger<CrashReportProcessorJob> logger, IService
         _serviceScopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
     }
 
-    private static async Task FilterCrashReportsAsync(TenantId tenant,
-        IServiceProvider serviceProvider,
-        IEnumerable<CrashReportFileMetadata> requests,
-        ChannelWriter<CrashReportFileMetadata> toDownloadChannel,
-        ChannelWriter<CrashReportToFileIdEntity> linkedCrashReportsChannel,
-        ChannelWriter<CrashReportIgnoredFileEntity> ignoredCrashReportsChannel,
-        CancellationToken ct)
-    {
-        var dbContextFactory = serviceProvider.GetRequiredService<IAppDbContextFactory>();
-        var dbContextPool = new ObjectPool<IAppDbContextRead>(dbContextFactory.CreateReadAsync);
-
-        var exceptions = new ConcurrentQueue<Exception>();
-        var options = new ParallelOptions { CancellationToken = ct, MaxDegreeOfParallelism = ParallelCount };
-        await Parallel.ForEachAsync(requests, options, async (entry, ct2) =>
-        {
-            try
-            {
-                var (fileId, crashReportId, _, _) = entry;
-
-                var dbContextRead = await dbContextPool.GetAsync(ct2);
-                try
-                {
-                    var hasCrashReport = dbContextRead.CrashReports.Any(x => x.CrashReportId == crashReportId);
-                    if (hasCrashReport)
-                    {
-                        var hasCrashReportLink = dbContextRead.CrashReportToFileIds.Any(x => x.CrashReportId == crashReportId);
-                        if (!hasCrashReportLink)
-                        {
-                            await linkedCrashReportsChannel.WriteAsync(new CrashReportToFileIdEntity
-                            {
-                                TenantId = tenant,
-                                CrashReportId = crashReportId,
-                                FileId = fileId
-                            }, ct2);
-                            return;
-                        }
-                    }
-
-                    // Ignore incorrect crash reports
-                    var isDuplicateCrashReport = dbContextRead.CrashReportToFileIds.Any(x => x.CrashReportId == crashReportId && x.FileId != fileId);
-                    if (isDuplicateCrashReport)
-                    {
-                        await ignoredCrashReportsChannel.WriteAsync(new CrashReportIgnoredFileEntity
-                        {
-                            TenantId = tenant,
-                            Value = fileId
-                        }, ct2);
-                        return;
-                    }
-                }
-                finally
-                {
-                    dbContextPool.Return(dbContextRead);
-                }
-
-                // Handle the crash report further
-                await toDownloadChannel.WaitToWriteAsync(ct2);
-                await toDownloadChannel.WriteAsync(entry, ct2);
-            }
-            catch (Exception e)
-            {
-                exceptions.Enqueue(e);
-            }
-        });
-        if (!exceptions.IsEmpty) throw new AggregateException(exceptions);
-
-        toDownloadChannel.Complete();
-        ignoredCrashReportsChannel.Complete();
-        linkedCrashReportsChannel.Complete();
-    }
-
-    private static async Task DownloadCrashReportsAsync(
-        TenantId tenant,
-        ILogger logger,
-        CrashReporterClient client,
-        ChannelReader<CrashReportFileMetadata> toDownloadChannel,
-        ChannelWriter<HttpResultEntry> httpResultChannel,
-        CancellationToken ct)
-    {
-        var exceptions = new ConcurrentQueue<Exception>();
-        var options = new ParallelOptions { CancellationToken = ct, MaxDegreeOfParallelism = ParallelCount };
-        await Parallel.ForEachAsync(toDownloadChannel.ReadAllAsync(ct), options, async (entry, ct2) =>
-        {
-            try
-            {
-                var (fileId, _, version, date) = entry;
-
-                CrashReportModel? model;
-                if (version <= 12)
-                {
-                    var content = await client.GetCrashReportAsync(fileId, ct2);
-
-                    try
-                    {
-                        model = CrashReportParser.ParseLegacyHtml(version, content);
-                    }
-                    catch (Exception e)
-                    {
-                        logger.LogError(e, "Failed to parse {FileId}", fileId);
-                        throw;
-                    }
-                }
-                else
-                {
-                    model = await client.GetCrashReportModelAsync(fileId, ct2);
-                }
-
-                if (model is null)
-                {
-                    logger.LogError("Failed to parse {FileId}", fileId);
-                    return;
-                }
-
-                await httpResultChannel.WaitToWriteAsync(ct2);
-                await httpResultChannel.WriteAsync(new(fileId, date, model), ct2);
-            }
-            catch (Exception e)
-            {
-                exceptions.Enqueue(e);
-            }
-        });
-        if (!exceptions.IsEmpty) throw new AggregateException(exceptions);
-
-        httpResultChannel.Complete();
-    }
-
-    private static async Task WriteIgnoredToDatabaseAsync(
-        TenantId tenant,
-        IServiceProvider serviceProvider,
-        ChannelReader<CrashReportIgnoredFileEntity> ignoredCrashReportsChannel,
-        CancellationToken ct)
-    {
-        var dbContextFactory = serviceProvider.GetRequiredService<IAppDbContextFactory>();
-        var dbContextWrite = await dbContextFactory.CreateWriteAsync(ct);
-        var entries = await ignoredCrashReportsChannel.ReadAllAsync(ct).ToArrayAsync(ct);
-        dbContextWrite.FutureUpsert(x => x.CrashReportIgnoredFileIds, entries);
-        await dbContextWrite.SaveAsync(ct);
-    }
-
-    private static async Task WriteLinkedToDatabaseAsync(
-        TenantId tenant,
-        IServiceProvider serviceProvider,
-        ChannelReader<CrashReportToFileIdEntity> linkedCrashReportsChannel,
-        CancellationToken ct)
-    {
-        var dbContextFactory = serviceProvider.GetRequiredService<IAppDbContextFactory>();
-        var dbContextWrite = await dbContextFactory.CreateWriteAsync(ct);
-        var entries = await linkedCrashReportsChannel.ReadAllAsync(ct).ToArrayAsync(ct);
-        dbContextWrite.FutureUpsert(x => x.CrashReportToFileIds, entries);
-        await dbContextWrite.SaveAsync(ct);
-    }
-
-    private static async Task WriteCrashReportsToDatabaseAsync(
-        TenantId tenant,
-        CrashReporterOptions options,
-        IServiceProvider serviceProvider,
-        ChannelReader<HttpResultEntry> httpResultChannel,
-        CancellationToken ct)
-    {
-        static string GetException(ExceptionModel? exception, bool inner = false) => exception is null ? string.Empty : $"""
-
-{(inner ? "Inner ": string.Empty)}Exception information
-Type: {exception.Type}
-Message: {exception.Message}
-CallStack:
-{exception.CallStack}
-
-{GetException(exception.InnerException, true)}
-""";
-
-        var dbContextFactory = serviceProvider.GetRequiredService<IAppDbContextFactory>();
-        var dbContextWrite = await dbContextFactory.CreateWriteAsync(ct);
-        var entityFactory = dbContextWrite.GetEntityFactory();
-        await using var _ = dbContextWrite.CreateSaveScope();
-
-        // Filter out duplicate reports
-        var uniqueIds = new HashSet<CrashReportId>();
-        var ignored = new List<CrashReportIgnoredFileEntity>();
-        var crashReports = new List<CrashReportEntity>();
-        var crashReportMetadatas = new List<CrashReportToMetadataEntity>();
-        var crashReportModules = new List<CrashReportToModuleMetadataEntity>();
-        var crashReportFileIds = new List<CrashReportToFileIdEntity>();
-        await foreach (var (fileId, date, report) in httpResultChannel.ReadAllAsync(ct))
-        {
-            var crashReportId = CrashReportId.From(report.Id);
-
-            if (uniqueIds.Contains(crashReportId))
-            {
-                ignored.Add(new CrashReportIgnoredFileEntity
-                {
-                    TenantId = tenant,
-                    Value = fileId
-                });
-                continue;
-            }
-
-            uniqueIds.Add(crashReportId);
-
-            var butrLoaderVersion = report.Metadata.AdditionalMetadata.FirstOrDefault(x => x.Key == "BUTRLoaderVersion")?.Value;
-            var blseVersion = report.Metadata.AdditionalMetadata.FirstOrDefault(x => x.Key == "BLSEVersion")?.Value;
-            var launcherExVersion = report.Metadata.AdditionalMetadata.FirstOrDefault(x => x.Key == "LauncherExVersion")?.Value;
-
-            crashReports.Add(new CrashReportEntity
-            {
-                TenantId = tenant,
-                CrashReportId = crashReportId,
-                Url = CrashReportUrl.From(new Uri(new Uri(options.Endpoint), fileId.ToString())),
-                Version = CrashReportVersion.From(report.Version),
-                GameVersion = GameVersion.From(report.GameVersion),
-                ExceptionType = entityFactory.GetOrCreateExceptionType(ExceptionTypeId.From(report.Exception.Type)),
-                Exception = GetException(report.Exception),
-                CreatedAt = fileId.Value.Length == 8 ? DateTime.UnixEpoch : date.ToUniversalTime(),
-            });
-            crashReportMetadatas.Add(new CrashReportToMetadataEntity
-            {
-                TenantId = tenant,
-                CrashReportId = crashReportId,
-                LauncherType = string.IsNullOrEmpty(report.Metadata.LauncherType) ? null : report.Metadata.LauncherType,
-                LauncherVersion = string.IsNullOrEmpty(report.Metadata.LauncherVersion) ? null : report.Metadata.LauncherVersion,
-                Runtime = string.IsNullOrEmpty(report.Metadata.Runtime) ? null : report.Metadata.Runtime,
-                BUTRLoaderVersion = butrLoaderVersion,
-                BLSEVersion = blseVersion,
-                LauncherExVersion = launcherExVersion,
-            });
-            crashReportModules.AddRange(report.Modules.Select(x => new CrashReportToModuleMetadataEntity
-            {
-                TenantId = tenant,
-                CrashReportId = crashReportId,
-                Module = entityFactory.GetOrCreateModule(ModuleId.From(x.Id)),
-                Version = ModuleVersion.From(x.Version),
-                NexusModsMod = NexusModsModId.TryParseUrl(x.Url, out var modId) ? entityFactory.GetOrCreateNexusModsMod(modId) : null,
-                IsInvolved = report.InvolvedModules.Any(y => y.Id == x.Id),
-            }));
-            crashReportFileIds.Add(new CrashReportToFileIdEntity
-            {
-                TenantId = tenant,
-                CrashReportId = crashReportId,
-                FileId = fileId
-            });
-        }
-
-        dbContextWrite.FutureUpsert(x => x.CrashReportIgnoredFileIds, ignored);
-        dbContextWrite.FutureUpsert(x => x.CrashReports, crashReports);
-        dbContextWrite.FutureUpsert(x => x.CrashReportToFileIds, crashReportFileIds);
-        dbContextWrite.FutureUpsert(x => x.CrashReportModuleInfos, crashReportModules);
-        dbContextWrite.FutureUpsert(x => x.CrashReportToMetadatas, crashReportMetadatas);
-        // Disposing the DBContext will save the data
-    }
-
-    private static async Task HandleFileIdDatesAsync(TenantId tenant, IServiceProvider serviceProvider, ILogger logger, CrashReporterClient client, IEnumerable<CrashReportFileMetadata> requests, CancellationToken ct)
-    {
-        var options = serviceProvider.GetRequiredService<IOptions<CrashReporterOptions>>().Value;
-        var toDownloadChannel = Channel.CreateBounded<CrashReportFileMetadata>(ParallelCount);
-        var httpResultChannel = Channel.CreateBounded<HttpResultEntry>(ParallelCount);
-        var linkedCrashReportsChannel = Channel.CreateUnbounded<CrashReportToFileIdEntity>();
-        var ignoredCrashReportsChannel = Channel.CreateUnbounded<CrashReportIgnoredFileEntity>();
-
-        await Task.WhenAll(new Task[]
-        {
-            FilterCrashReportsAsync(tenant, serviceProvider, requests, toDownloadChannel, linkedCrashReportsChannel, ignoredCrashReportsChannel, ct),
-            DownloadCrashReportsAsync(tenant, logger, client, toDownloadChannel, httpResultChannel, ct),
-            WriteIgnoredToDatabaseAsync(tenant, serviceProvider, ignoredCrashReportsChannel, ct),
-            WriteLinkedToDatabaseAsync(tenant, serviceProvider, linkedCrashReportsChannel, ct),
-            WriteCrashReportsToDatabaseAsync(tenant, options, serviceProvider, httpResultChannel, ct),
-        });
-    }
-
     public async Task Execute(IJobExecutionContext context)
     {
         var ct = context.CancellationToken;
@@ -335,10 +39,11 @@ public async Task Execute(IJobExecutionContext context)
             tenantContextAccessor.Current = tenant;
 
             var client = scope.ServiceProvider.GetRequiredService<CrashReporterClient>();
+            await using var crashReportBatchedHandler = scope.ServiceProvider.GetRequiredService<CrashReportBatchedHandler>();
 
-            await foreach (var batch in client.GetNewCrashReportMetadatasAsync(DateTime.UtcNow.AddHours(-2), ct).OfType<CrashReportFileMetadata>().ChunkAsync(100).WithCancellation(ct))
+            await foreach (var batch in client.GetNewCrashReportMetadatasAsync(DateTime.UtcNow.AddDays(-2), ct).OfType<CrashReportFileMetadata>().ChunkAsync(1000).WithCancellation(ct))
             {
-                await HandleFileIdDatesAsync(tenant, scope.ServiceProvider, _logger, client, batch, ct);
+                await crashReportBatchedHandler.HandleBatchAsync(batch, ct);
                 processed += batch.Count;
             }
         }
diff --git a/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsArticleProcessorJob.cs b/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsArticleProcessorJob.cs
index 3abc69a8..9f1fc91a 100644
--- a/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsArticleProcessorJob.cs
+++ b/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsArticleProcessorJob.cs
@@ -10,7 +10,7 @@
 using Quartz;
 
 using System;
-using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -62,8 +62,8 @@ private static async Task HandleTenantAsync(TenantId tenant, IServiceProvider se
         var @break = false;
         while (!ct.IsCancellationRequested && !@break)
         {
-            await using var _ = dbContextWrite.CreateSaveScope();
-            var articles = new List<NexusModsArticleEntity>();
+            await using var _ = await dbContextWrite.CreateSaveScopeAsync();
+            var articles = ImmutableArray.CreateBuilder<NexusModsArticleEntity>();
 
             for (var i = 0; i < 50; i++)
             {
@@ -103,7 +103,7 @@ private static async Task HandleTenantAsync(TenantId tenant, IServiceProvider se
                 var dateTimeText1 = fileinfoElement.ChildNodes.FindFirst("div");
                 var dateTimeText2 = dateTimeText1?.ChildNodes.FindFirst("time");
                 var dateTimeText = dateTimeText2?.GetAttributeValue("datetime", "");
-                var dateTime = DateTimeOffset.TryParse(dateTimeText, out var dateTimeVal) ? dateTimeVal.UtcDateTime : DateTimeOffset.MinValue.UtcDateTime;
+                var dateTime = DateTimeOffset.TryParse(dateTimeText, out var dateTimeVal) ? dateTimeVal.ToUniversalTime() : DateTimeOffset.MinValue.ToUniversalTime();
 
                 articles.Add(new()
                 {
@@ -116,7 +116,7 @@ private static async Task HandleTenantAsync(TenantId tenant, IServiceProvider se
                 articleIdRaw++;
             }
 
-            dbContextWrite.FutureUpsert(x => x.NexusModsArticles, articles);
+            await dbContextWrite.NexusModsArticles.UpsertOnSaveAsync(articles.ToArray());
             // Disposing the DBContext will save the data
         }
     }
diff --git a/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsArticleUpdatesProcessorJob.cs b/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsArticleUpdatesProcessorJob.cs
index 31305e09..9a980eaf 100644
--- a/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsArticleUpdatesProcessorJob.cs
+++ b/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsArticleUpdatesProcessorJob.cs
@@ -10,7 +10,7 @@
 using Quartz;
 
 using System;
-using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -56,11 +56,11 @@ private static async Task<int> HandleTenantAsync(TenantId tenant, IServiceProvid
         var dbContextRead = serviceProvider.GetRequiredService<IAppDbContextRead>();
         var dbContextWrite = serviceProvider.GetRequiredService<IAppDbContextWrite>();
         var entityFactory = dbContextWrite.GetEntityFactory();
-        await using var _ = dbContextWrite.CreateSaveScope();
+        await using var _ = await dbContextWrite.CreateSaveScopeAsync();
 
         var gameDomain = tenant.ToGameDomain();
 
-        var articles = new List<NexusModsArticleEntity>();
+        var articles = ImmutableArray.CreateBuilder<NexusModsArticleEntity>();
 
         var articleIdRaw = dbContextRead.NexusModsArticles.OrderBy(x => x.NexusModsArticleId).LastOrDefault()?.NexusModsArticleId.Value ?? 0;
         var notFoundArticles = 0;
@@ -102,7 +102,7 @@ private static async Task<int> HandleTenantAsync(TenantId tenant, IServiceProvid
             var dateTimeText1 = fileinfoElement.ChildNodes.FindFirst("div");
             var dateTimeText2 = dateTimeText1?.ChildNodes.FindFirst("time");
             var dateTimeText = dateTimeText2?.GetAttributeValue("datetime", "");
-            var dateTime = DateTimeOffset.TryParse(dateTimeText, out var dateTimeVal) ? dateTimeVal.UtcDateTime : DateTimeOffset.MinValue.UtcDateTime;
+            var dateTime = DateTimeOffset.TryParse(dateTimeText, out var dateTimeVal) ? dateTimeVal.ToUniversalTime() : DateTimeOffset.MinValue.ToUniversalTime();
 
             articles.Add(new()
             {
@@ -116,7 +116,7 @@ private static async Task<int> HandleTenantAsync(TenantId tenant, IServiceProvid
             processed++;
         }
 
-        dbContextWrite.FutureUpsert(x => x.NexusModsArticles, articles);
+        await dbContextWrite.NexusModsArticles.UpsertOnSaveAsync(articles.ToArray());
         // Disposing the DBContext will save the data
 
         return processed;
diff --git a/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsModFileProcessorJob.cs b/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsModFileProcessorJob.cs
index 9fb85c71..fb26ecab 100644
--- a/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsModFileProcessorJob.cs
+++ b/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsModFileProcessorJob.cs
@@ -13,6 +13,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -77,9 +78,9 @@ public async Task Execute(IJobExecutionContext context)
         {
             var modId = NexusModsModId.From(modIdRaw);
 
-            var nexusModsModModuleEntities = new List<NexusModsModToModuleEntity>();
-            var nexusModsModToFileUpdateEntities = new List<NexusModsModToFileUpdateEntity>();
-            var nexusModsModToModuleInfoHistoryEntities = new List<NexusModsModToModuleInfoHistoryEntity>();
+            var nexusModsModModuleEntities = ImmutableArray.CreateBuilder<NexusModsModToModuleEntity>();
+            var nexusModsModToFileUpdateEntities = ImmutableArray.CreateBuilder<NexusModsModToFileUpdateEntity>();
+            var nexusModsModToModuleInfoHistoryEntities = ImmutableArray.CreateBuilder<NexusModsModToModuleInfoHistoryEntity>();
 
             try
             {
@@ -94,7 +95,7 @@ public async Task Execute(IJobExecutionContext context)
                 }
 
                 var infos = await info.GetModuleInfosAsync(gameDomain, modId, response.Files, options.ApiKey, ct).ToArrayAsync(ct);
-                var latestFileUpdate = DateTimeOffset.FromUnixTimeSeconds(response.Files.Select(x => x.UploadedTimestamp).Where(x => x is not null).Max() ?? 0).UtcDateTime;
+                var latestFileUpdate = DateTimeOffset.FromUnixTimeSeconds(response.Files.Select(x => x.UploadedTimestamp).Where(x => x is not null).Max() ?? 0).ToUniversalTime();
 
                 nexusModsModModuleEntities.AddRange(infos.Select(x => x.ModuleInfo).DistinctBy(x => x.Id).Select(x => new NexusModsModToModuleEntity
                 {
@@ -121,10 +122,10 @@ public async Task Execute(IJobExecutionContext context)
                     UploadDate = x.Uploaded,
                 }));
 
-                await using var _ = dbContextWrite.CreateSaveScope();
-                dbContextWrite.FutureUpsert(x => x.NexusModsModModules, nexusModsModModuleEntities);
-                dbContextWrite.FutureUpsert(x => x.NexusModsModToFileUpdates, nexusModsModToFileUpdateEntities);
-                dbContextWrite.FutureUpsert(x => x.NexusModsModToModuleInfoHistory, nexusModsModToModuleInfoHistoryEntities);
+                await using var _ = await dbContextWrite.CreateSaveScopeAsync();
+                await dbContextWrite.NexusModsModModules.UpsertOnSaveAsync(nexusModsModModuleEntities.ToArray());
+                await dbContextWrite.NexusModsModToFileUpdates.UpsertOnSaveAsync(nexusModsModToFileUpdateEntities.ToArray());
+                await dbContextWrite.NexusModsModToModuleInfoHistory.UpsertOnSaveAsync(nexusModsModToModuleInfoHistoryEntities.ToArray());
                 // Disposing the DBContext will save the data
 
                 processed++;
diff --git a/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsModFileUpdatesProcessorJob.cs b/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsModFileUpdatesProcessorJob.cs
index b7a90c62..25cbc64f 100644
--- a/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsModFileUpdatesProcessorJob.cs
+++ b/src/BUTR.Site.NexusMods.Server/Jobs/NexusModsModFileUpdatesProcessorJob.cs
@@ -78,14 +78,14 @@ public async Task Execute(IJobExecutionContext context)
         var dbContextRead = serviceProvider.GetRequiredService<IAppDbContextRead>();
         var dbContextWrite = serviceProvider.GetRequiredService<IAppDbContextWrite>();
         var entityFactory = dbContextWrite.GetEntityFactory();
-        await using var _ = dbContextWrite.CreateSaveScope();
+        await using var _ = await dbContextWrite.CreateSaveScopeAsync();
 
         var dateOneWeekAgo = DateTime.UtcNow.AddDays(-7);
         var updatesStoredWithinWeek = await dbContextRead.NexusModsModToFileUpdates.Where(x => x.LastCheckedDate > dateOneWeekAgo).ToListAsync(ct);
         var updatedWithinWeek = await client.GetAllModUpdatesWeekAsync(gameDomain, options.ApiKey, ct) ?? Array.Empty<NexusModsUpdatedModsResponse>();
         var newUpdates = updatedWithinWeek.Where(x =>
         {
-            var latestFileUpdateDate = DateTimeOffset.FromUnixTimeSeconds(x.LatestFileUpdateTimestamp).UtcDateTime;
+            var latestFileUpdateDate = DateTimeOffset.FromUnixTimeSeconds(x.LatestFileUpdateTimestamp).ToUniversalTime();
             if (latestFileUpdateDate < dateOneWeekAgo) return false;
 
             var found = updatesStoredWithinWeek.FirstOrDefault(y => y.NexusModsMod.NexusModsModId == x.Id);
@@ -94,9 +94,6 @@ public async Task Execute(IJobExecutionContext context)
 
         var processed = 0;
         var exceptions = new List<Exception>();
-        var nexusModsModModuleEntities = new List<NexusModsModToModuleEntity>();
-        var nexusModsModToFileUpdateEntities = new List<NexusModsModToFileUpdateEntity>();
-        var nexusModsModToModuleInfoHistoryEntities = new List<NexusModsModToModuleInfoHistoryEntity>();
         foreach (var modUpdate in newUpdates)
         {
             try
@@ -109,9 +106,9 @@ public async Task Execute(IJobExecutionContext context)
                 if (updates.Length == 0) continue;
 
                 var infos = await info.GetModuleInfosAsync(gameDomain, modUpdate.Id, response.Files.Where(x => updates.Any(y => y.NewId == x.FileId)), options.ApiKey, ct).ToArrayAsync(ct);
-                var lastUpdateTime = DateTimeOffset.FromUnixTimeSeconds(modUpdate.LatestFileUpdateTimestamp).UtcDateTime;
+                var lastUpdateTime = DateTimeOffset.FromUnixTimeSeconds(modUpdate.LatestFileUpdateTimestamp).ToUniversalTime();
 
-                nexusModsModModuleEntities.AddRange(infos.Select(x => x.ModuleInfo).DistinctBy(x => x.Id).Select(x => new NexusModsModToModuleEntity
+                await dbContextWrite.NexusModsModModules.UpsertOnSaveAsync(infos.Select(x => x.ModuleInfo).DistinctBy(x => x.Id).Select(x => new NexusModsModToModuleEntity
                 {
                     TenantId = tenant,
                     NexusModsMod = entityFactory.GetOrCreateNexusModsMod(modUpdate.Id),
@@ -119,13 +116,13 @@ public async Task Execute(IJobExecutionContext context)
                     LastUpdateDate = lastUpdateTime,
                     LinkType = NexusModsModToModuleLinkType.ByUnverifiedFileExposure
                 }));
-                nexusModsModToFileUpdateEntities.Add(new NexusModsModToFileUpdateEntity
+                await dbContextWrite.NexusModsModToFileUpdates.UpsertOnSaveAsync(new NexusModsModToFileUpdateEntity
                 {
                     TenantId = tenant,
                     NexusModsMod = entityFactory.GetOrCreateNexusModsMod(modUpdate.Id),
                     LastCheckedDate = lastUpdateTime
                 });
-                nexusModsModToModuleInfoHistoryEntities.AddRange(infos.DistinctBy(x => new { x.ModuleInfo.Id, x.ModuleInfo.Version, x.FileId }).Select(x => new NexusModsModToModuleInfoHistoryEntity
+                await dbContextWrite.NexusModsModToModuleInfoHistory.UpsertOnSaveAsync(infos.DistinctBy(x => new { x.ModuleInfo.Id, x.ModuleInfo.Version, x.FileId }).Select(x => new NexusModsModToModuleInfoHistoryEntity
                 {
                     TenantId = tenant,
                     NexusModsFileId = x.FileId,
@@ -143,9 +140,6 @@ public async Task Execute(IJobExecutionContext context)
             }
         }
 
-        dbContextWrite.FutureUpsert(x => x.NexusModsModModules, nexusModsModModuleEntities);
-        dbContextWrite.FutureUpsert(x => x.NexusModsModToFileUpdates, nexusModsModToFileUpdateEntities);
-        dbContextWrite.FutureUpsert(x => x.NexusModsModToModuleInfoHistory, nexusModsModToModuleInfoHistoryEntities);
         // Disposing the DBContext will save the data
 
         return (processed, exceptions, updatesStoredWithinWeek.Count, updatedWithinWeek.Length, newUpdates.Count);
diff --git a/src/BUTR.Site.NexusMods.Server/Jobs/TopExceptionsTypesAnalyzerProcessorJob.cs b/src/BUTR.Site.NexusMods.Server/Jobs/TopExceptionsTypesAnalyzerProcessorJob.cs
index b238766a..272ed478 100644
--- a/src/BUTR.Site.NexusMods.Server/Jobs/TopExceptionsTypesAnalyzerProcessorJob.cs
+++ b/src/BUTR.Site.NexusMods.Server/Jobs/TopExceptionsTypesAnalyzerProcessorJob.cs
@@ -51,16 +51,16 @@ private static async Task HandleTenantAsync(TenantId tenant, IServiceProvider se
         var dbContextRead = serviceProvider.GetRequiredService<IAppDbContextRead>();
         var dbContextWrite = serviceProvider.GetRequiredService<IAppDbContextWrite>();
         var entityFactory = dbContextWrite.GetEntityFactory();
-        await using var _ = dbContextWrite.CreateSaveScope();
+        await using var _ = await dbContextWrite.CreateSaveScopeAsync();
 
         var statisticsQuery = await dbContextRead.ExceptionTypes.Include(x => x.ToCrashReports).AsSplitQuery().Select(x => new StatisticsTopExceptionsTypeEntity
         {
             TenantId = tenant,
             ExceptionType = entityFactory.GetOrCreateExceptionType(x.ExceptionTypeId),
             ExceptionCount = x.ToCrashReports.Count
-        }).ToListAsync(ct);
+        }).ToArrayAsync(ct);
 
-        dbContextWrite.FutureSyncronize(x => x.StatisticsTopExceptionsTypes, statisticsQuery);
+        await dbContextWrite.StatisticsTopExceptionsTypes.SynchronizeOnSaveAsync(statisticsQuery);
         // Disposing the DBContext will save the data
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Migrations/20231017195044_NexusModsModToModuleInfoHistory3.Designer.cs b/src/BUTR.Site.NexusMods.Server/Migrations/20231017195044_NexusModsModToModuleInfoHistory3.Designer.cs
new file mode 100644
index 00000000..11d313a9
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Migrations/20231017195044_NexusModsModToModuleInfoHistory3.Designer.cs
@@ -0,0 +1,1455 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Models.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace BUTR.Site.NexusMods.Server.Migrations
+{
+    [DbContext(typeof(BaseAppDbContext))]
+    [Migration("20231017195044_NexusModsModToModuleInfoHistory3")]
+    partial class NexusModsModToModuleInfoHistory3
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0-rc.1.23419.6")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "hstore");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.AutocompleteEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("AutocompleteId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("autocomplete_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AutocompleteId"));
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("type");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("value");
+
+                    b.HasKey("TenantId", "AutocompleteId");
+
+                    b.HasIndex("Type");
+
+                    b.ToTable("autocomplete", "autocomplete");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<string>("Exception")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("exception");
+
+                    b.Property<string>("ExceptionTypeId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("exception_type_id");
+
+                    b.Property<string>("GameVersion")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("game_version");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("url");
+
+                    b.Property<byte>("Version")
+                        .HasColumnType("smallint")
+                        .HasColumnName("version");
+
+                    b.HasKey("TenantId", "CrashReportId");
+
+                    b.HasIndex("TenantId", "ExceptionTypeId");
+
+                    b.ToTable("crash_report", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportIgnoredFileEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text")
+                        .HasColumnName("crash_report_file_ignored_id");
+
+                    b.HasKey("TenantId", "Value");
+
+                    b.ToTable("crash_report_file_ignored", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToFileIdEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_file_id");
+
+                    b.Property<string>("FileId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("file_id");
+
+                    b.HasKey("TenantId", "CrashReportId");
+
+                    b.ToTable("crash_report_file", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToMetadataEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_metadata_id");
+
+                    b.Property<string>("BLSEVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("blse_version");
+
+                    b.Property<string>("BUTRLoaderVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("butrloader_version");
+
+                    b.Property<string>("LauncherExVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("launcherex_version");
+
+                    b.Property<string>("LauncherType")
+                        .HasColumnType("text")
+                        .HasColumnName("launcher_type");
+
+                    b.Property<string>("LauncherVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("launcher_version");
+
+                    b.Property<string>("Runtime")
+                        .HasColumnType("text")
+                        .HasColumnName("runtime");
+
+                    b.HasKey("TenantId", "CrashReportId");
+
+                    b.ToTable("crash_report_metadata", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToModuleMetadataEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_module_info_id");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<bool>("IsInvolved")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_involved");
+
+                    b.Property<int?>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_id");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("version");
+
+                    b.HasKey("TenantId", "CrashReportId", "ModuleId");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.HasIndex("TenantId", "NexusModsModId");
+
+                    b.ToTable("crash_report_module_info", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<string>("ExceptionTypeId")
+                        .HasColumnType("text")
+                        .HasColumnName("exception_type_id");
+
+                    b.HasKey("TenantId", "ExceptionTypeId");
+
+                    b.ToTable("exception_type", "exception");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationDiscordTokensEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("integration_discord_tokens_id");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("access_token");
+
+                    b.Property<DateTimeOffset>("AccessTokenExpiresAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("access_token_expires_at");
+
+                    b.Property<string>("DiscordUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("discord_user_id");
+
+                    b.Property<string>("RefreshToken")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("refresh_token");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.HasIndex("DiscordUserId")
+                        .IsUnique();
+
+                    b.ToTable("integration_discord_tokens", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGToOwnedTenantEntity", b =>
+                {
+                    b.Property<string>("GOGUserId")
+                        .HasColumnType("text")
+                        .HasColumnName("integration_gog_owned_tenant_id");
+
+                    b.Property<byte>("OwnedTenant")
+                        .HasColumnType("smallint")
+                        .HasColumnName("owned_tenant");
+
+                    b.HasKey("GOGUserId", "OwnedTenant");
+
+                    b.HasIndex("OwnedTenant");
+
+                    b.ToTable("integration_gog_owned_tenant", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGTokensEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("integration_gog_tokens_id");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("access_token");
+
+                    b.Property<DateTimeOffset>("AccessTokenExpiresAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("access_token_expires_at");
+
+                    b.Property<string>("GOGUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gog_user_id");
+
+                    b.Property<string>("RefreshToken")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("refresh_token");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.HasIndex("GOGUserId")
+                        .IsUnique();
+
+                    b.ToTable("integration_gog_tokens", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamToOwnedTenantEntity", b =>
+                {
+                    b.Property<string>("SteamUserId")
+                        .HasColumnType("text")
+                        .HasColumnName("integration_steam_owned_tenant_id");
+
+                    b.Property<byte>("OwnedTenant")
+                        .HasColumnType("smallint")
+                        .HasColumnName("owned_tenant");
+
+                    b.HasKey("SteamUserId", "OwnedTenant");
+
+                    b.HasIndex("OwnedTenant");
+
+                    b.ToTable("integration_steam_owned_tenant", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamTokensEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("integration_steam_tokens_id");
+
+                    b.Property<Dictionary<string, string>>("Data")
+                        .IsRequired()
+                        .HasColumnType("hstore")
+                        .HasColumnName("data");
+
+                    b.Property<string>("SteamUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("steam_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.HasIndex("SteamUserId")
+                        .IsUnique();
+
+                    b.ToTable("integration_steam_tokens", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.HasKey("TenantId", "ModuleId");
+
+                    b.ToTable("module", "module");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsArticleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsArticleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_article_entity_id");
+
+                    b.Property<DateTime>("CreateDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("create_date");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("author_id");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("TenantId", "NexusModsArticleId");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.ToTable("nexusmods_article_entity", "nexusmods_article");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_id");
+
+                    b.HasKey("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_mod", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToFileUpdateEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_file_update_id");
+
+                    b.Property<DateTime>("LastCheckedDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_of_last_check");
+
+                    b.HasKey("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_mod_file_update", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToModuleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_module_id");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<int>("LinkType")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_module_link_type_id");
+
+                    b.Property<DateTime>("LastUpdateDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_of_last_update");
+
+                    b.HasKey("TenantId", "NexusModsModId", "ModuleId", "LinkType");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.ToTable("nexusmods_mod_module", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToModuleInfoHistoryEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsFileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_file_id");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_module_info_history_id");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<string>("ModuleVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("module_version");
+
+                    b.Property<ModuleInfoModel>("ModuleInfo")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("module_info");
+
+                    b.Property<DateTime>("UploadDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_of_upload");
+
+                    b.HasKey("TenantId", "NexusModsFileId", "NexusModsModId", "ModuleId", "ModuleVersion");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.HasIndex("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_mod_module_info_history", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToNameEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_name_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_mod_name", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToCrashReportEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_crash_report_id");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_id");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("comment");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer")
+                        .HasColumnName("status");
+
+                    b.HasKey("TenantId", "NexusModsUserId", "CrashReportId");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.HasIndex("TenantId", "CrashReportId");
+
+                    b.ToTable("nexusmods_user_crash_report", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_to_discord_id");
+
+                    b.Property<string>("DiscordUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("discord_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_to_integration_discord", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_to_gog_id");
+
+                    b.Property<string>("GOGUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gog_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_to_integration_gog", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_to_steam_id");
+
+                    b.Property<string>("SteamUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("steam_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_to_integration_steam", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToModuleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_module_id");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<int>("LinkType")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_module_link_type_id");
+
+                    b.HasKey("TenantId", "NexusModsUserId", "ModuleId", "LinkType");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.ToTable("nexusmods_user_module", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNameEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_name_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_name", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNexusModsModEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_nexusmods_mod_id");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_id");
+
+                    b.Property<int>("LinkType")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_nexusmods_mod_link_type_id");
+
+                    b.HasKey("TenantId", "NexusModsUserId", "NexusModsModId", "LinkType");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.HasIndex("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_user_nexusmods_mod", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToRoleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_role_id");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role");
+
+                    b.HasKey("TenantId", "NexusModsUserId");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_role", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.QuartzExecutionLogEntity", b =>
+                {
+                    b.Property<long>("LogId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasColumnName("quartz_execution_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("LogId"));
+
+                    b.Property<DateTimeOffset>("DateAddedUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_added_utc");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("error_message");
+
+                    b.Property<QuartzExecutionLogDetailEntity>("ExecutionLogDetail")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("execution_log_detail");
+
+                    b.Property<DateTimeOffset?>("FireTimeUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("fire_time_utc");
+
+                    b.Property<bool?>("IsException")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_exception");
+
+                    b.Property<bool?>("IsSuccess")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_success");
+
+                    b.Property<bool?>("IsVetoed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_vetoed");
+
+                    b.Property<string>("JobGroup")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("JobName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("job_name");
+
+                    b.Property<TimeSpan?>("JobRunTime")
+                        .HasColumnType("interval")
+                        .HasColumnName("job_run_time");
+
+                    b.Property<string>("LogType")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("log_type");
+
+                    b.Property<string>("MachineName")
+                        .HasColumnType("text")
+                        .HasColumnName("machie_name");
+
+                    b.Property<string>("Result")
+                        .HasColumnType("text")
+                        .HasColumnName("result");
+
+                    b.Property<int?>("RetryCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("retry_count");
+
+                    b.Property<string>("ReturnCode")
+                        .HasColumnType("text")
+                        .HasColumnName("return_code");
+
+                    b.Property<string>("RunInstanceId")
+                        .HasColumnType("text")
+                        .HasColumnName("run_instance_id");
+
+                    b.Property<DateTimeOffset?>("ScheduleFireTimeUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("_schedule_fire_time_utc");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("TriggerName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("trigger_name");
+
+                    b.HasKey("LogId");
+
+                    b.HasIndex("RunInstanceId");
+
+                    b.HasIndex("DateAddedUtc", "LogType");
+
+                    b.HasIndex("TriggerName", "TriggerGroup", "JobName", "JobGroup", "DateAddedUtc");
+
+                    b.ToTable("quartz_execution_log", "quartz");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsCrashScoreInvolvedEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("StatisticsCrashScoreInvolvedId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_score_involved_id");
+
+                    b.Property<string>("GameVersion")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("game_version");
+
+                    b.Property<int>("InvolvedCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("involved_count");
+
+                    b.Property<string>("ModuleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<string>("ModuleVersion")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("module_version");
+
+                    b.Property<int>("NotInvolvedCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("not_involved_count");
+
+                    b.Property<int>("RawValue")
+                        .HasColumnType("integer")
+                        .HasColumnName("value");
+
+                    b.Property<double>("Score")
+                        .HasColumnType("double precision")
+                        .HasColumnName("crash_score");
+
+                    b.Property<int>("TotalCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_count");
+
+                    b.HasKey("TenantId", "StatisticsCrashScoreInvolvedId");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.ToTable("crash_score_involved", "statistics");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsTopExceptionsTypeEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<string>("ExceptionTypeId")
+                        .HasColumnType("text")
+                        .HasColumnName("top_exceptions_type_id");
+
+                    b.Property<int>("ExceptionCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("count");
+
+                    b.HasKey("TenantId", "ExceptionTypeId");
+
+                    b.ToTable("top_exceptions_type", "statistics");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant_id");
+
+                    b.HasKey("TenantId");
+
+                    b.ToTable("tenant", "tenant");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.AutocompleteEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", "ExceptionType")
+                        .WithMany("ToCrashReports")
+                        .HasForeignKey("TenantId", "ExceptionTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ExceptionType");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportIgnoredFileEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToFileIdEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", "ToCrashReport")
+                        .WithOne("FileId")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToFileIdEntity", "TenantId", "CrashReportId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ToCrashReport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToMetadataEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", "ToCrashReport")
+                        .WithOne("Metadata")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToMetadataEntity", "TenantId", "CrashReportId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ToCrashReport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToModuleMetadataEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", "ToCrashReport")
+                        .WithMany("ModuleInfos")
+                        .HasForeignKey("TenantId", "CrashReportId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany()
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithMany()
+                        .HasForeignKey("TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Module");
+
+                    b.Navigation("NexusModsMod");
+
+                    b.Navigation("ToCrashReport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationDiscordTokensEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", "UserToDiscord")
+                        .WithOne("ToTokens")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationDiscordTokensEntity", "DiscordUserId")
+                        .HasPrincipalKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", "DiscordUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne()
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationDiscordTokensEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+
+                    b.Navigation("UserToDiscord");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGToOwnedTenantEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", null)
+                        .WithMany("ToOwnedTenants")
+                        .HasForeignKey("GOGUserId")
+                        .HasPrincipalKey("GOGUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("OwnedTenant")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGTokensEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", "UserToGOG")
+                        .WithOne("ToTokens")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGTokensEntity", "GOGUserId")
+                        .HasPrincipalKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", "GOGUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne()
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGTokensEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+
+                    b.Navigation("UserToGOG");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamToOwnedTenantEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("OwnedTenant")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", null)
+                        .WithMany("ToOwnedTenants")
+                        .HasForeignKey("SteamUserId")
+                        .HasPrincipalKey("SteamUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamTokensEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne()
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamTokensEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", "UserToSteam")
+                        .WithOne("ToTokens")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamTokensEntity", "SteamUserId")
+                        .HasPrincipalKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", "SteamUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+
+                    b.Navigation("UserToSteam");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsArticleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToArticles")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToFileUpdateEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithOne("FileUpdate")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToFileUpdateEntity", "TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsMod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToModuleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany("ToNexusModsMods")
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithMany("ModuleIds")
+                        .HasForeignKey("TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+
+                    b.Navigation("NexusModsMod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToModuleInfoHistoryEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany()
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithMany()
+                        .HasForeignKey("TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+
+                    b.Navigation("NexusModsMod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToNameEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithOne("Name")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToNameEntity", "TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsMod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToCrashReportEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToCrashReports")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", "ToCrashReport")
+                        .WithMany("ToUsers")
+                        .HasForeignKey("TenantId", "CrashReportId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+
+                    b.Navigation("ToCrashReport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne("ToDiscord")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne("ToGOG")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne("ToSteam")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToModuleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToModules")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany("ToNexusModsUsers")
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNameEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne("Name")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNameEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNexusModsModEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToNexusModsMods")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithMany("ToNexusModsUsers")
+                        .HasForeignKey("TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsMod");
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToRoleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToRoles")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsCrashScoreInvolvedEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany("ToCrashScore")
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsTopExceptionsTypeEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", "ExceptionType")
+                        .WithMany("ToTopExceptionsTypes")
+                        .HasForeignKey("TenantId", "ExceptionTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ExceptionType");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", b =>
+                {
+                    b.Navigation("FileId");
+
+                    b.Navigation("Metadata");
+
+                    b.Navigation("ModuleInfos");
+
+                    b.Navigation("ToUsers");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", b =>
+                {
+                    b.Navigation("ToCrashReports");
+
+                    b.Navigation("ToTopExceptionsTypes");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", b =>
+                {
+                    b.Navigation("ToCrashScore");
+
+                    b.Navigation("ToNexusModsMods");
+
+                    b.Navigation("ToNexusModsUsers");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", b =>
+                {
+                    b.Navigation("FileUpdate");
+
+                    b.Navigation("ModuleIds");
+
+                    b.Navigation("Name");
+
+                    b.Navigation("ToNexusModsUsers");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", b =>
+                {
+                    b.Navigation("Name");
+
+                    b.Navigation("ToArticles");
+
+                    b.Navigation("ToCrashReports");
+
+                    b.Navigation("ToDiscord");
+
+                    b.Navigation("ToGOG");
+
+                    b.Navigation("ToModules");
+
+                    b.Navigation("ToNexusModsMods");
+
+                    b.Navigation("ToRoles");
+
+                    b.Navigation("ToSteam");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", b =>
+                {
+                    b.Navigation("ToTokens");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", b =>
+                {
+                    b.Navigation("ToOwnedTenants");
+
+                    b.Navigation("ToTokens");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", b =>
+                {
+                    b.Navigation("ToOwnedTenants");
+
+                    b.Navigation("ToTokens");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/BUTR.Site.NexusMods.Server/Migrations/20231017195044_NexusModsModToModuleInfoHistory3.cs b/src/BUTR.Site.NexusMods.Server/Migrations/20231017195044_NexusModsModToModuleInfoHistory3.cs
new file mode 100644
index 00000000..89f2935f
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Migrations/20231017195044_NexusModsModToModuleInfoHistory3.cs
@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BUTR.Site.NexusMods.Server.Migrations
+{
+    /// <inheritdoc />
+    public partial class NexusModsModToModuleInfoHistory3 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "nexusmods_mod_name_id",
+                schema: "nexusmods_mod",
+                table: "nexusmods_mod_module_info_history",
+                newName: "nexusmods_mod_module_info_history_id");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_nexusmods_mod_module_info_history_tenant_nexusmods_mod_name~",
+                schema: "nexusmods_mod",
+                table: "nexusmods_mod_module_info_history",
+                newName: "IX_nexusmods_mod_module_info_history_tenant_nexusmods_mod_modu~");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "nexusmods_mod_module_info_history_id",
+                schema: "nexusmods_mod",
+                table: "nexusmods_mod_module_info_history",
+                newName: "nexusmods_mod_name_id");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_nexusmods_mod_module_info_history_tenant_nexusmods_mod_modu~",
+                schema: "nexusmods_mod",
+                table: "nexusmods_mod_module_info_history",
+                newName: "IX_nexusmods_mod_module_info_history_tenant_nexusmods_mod_name~");
+        }
+    }
+}
diff --git a/src/BUTR.Site.NexusMods.Server/Migrations/20231029211041_Quartz.Designer.cs b/src/BUTR.Site.NexusMods.Server/Migrations/20231029211041_Quartz.Designer.cs
new file mode 100644
index 00000000..a661a8cb
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Migrations/20231029211041_Quartz.Designer.cs
@@ -0,0 +1,1444 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Models.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace BUTR.Site.NexusMods.Server.Migrations
+{
+    [DbContext(typeof(BaseAppDbContext))]
+    [Migration("20231029211041_Quartz")]
+    partial class Quartz
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0-rc.2.23480.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "hstore");
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.HasSequence<int>("quartz_log_id_seq", "quartz");
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.AutocompleteEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("AutocompleteId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("autocomplete_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AutocompleteId"));
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("type");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("value");
+
+                    b.HasKey("TenantId", "AutocompleteId");
+
+                    b.HasIndex("Type");
+
+                    b.ToTable("autocomplete", "autocomplete");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_id");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<string>("Exception")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("exception");
+
+                    b.Property<string>("ExceptionTypeId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("exception_type_id");
+
+                    b.Property<string>("GameVersion")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("game_version");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("url");
+
+                    b.Property<byte>("Version")
+                        .HasColumnType("smallint")
+                        .HasColumnName("version");
+
+                    b.HasKey("TenantId", "CrashReportId");
+
+                    b.HasIndex("TenantId", "ExceptionTypeId");
+
+                    b.ToTable("crash_report", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportIgnoredFileEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text")
+                        .HasColumnName("crash_report_file_ignored_id");
+
+                    b.HasKey("TenantId", "Value");
+
+                    b.ToTable("crash_report_file_ignored", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToFileIdEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_file_id");
+
+                    b.Property<string>("FileId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("file_id");
+
+                    b.HasKey("TenantId", "CrashReportId");
+
+                    b.ToTable("crash_report_file", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToMetadataEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_metadata_id");
+
+                    b.Property<string>("BLSEVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("blse_version");
+
+                    b.Property<string>("BUTRLoaderVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("butrloader_version");
+
+                    b.Property<string>("LauncherExVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("launcherex_version");
+
+                    b.Property<string>("LauncherType")
+                        .HasColumnType("text")
+                        .HasColumnName("launcher_type");
+
+                    b.Property<string>("LauncherVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("launcher_version");
+
+                    b.Property<string>("Runtime")
+                        .HasColumnType("text")
+                        .HasColumnName("runtime");
+
+                    b.HasKey("TenantId", "CrashReportId");
+
+                    b.ToTable("crash_report_metadata", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToModuleMetadataEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_module_info_id");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<bool>("IsInvolved")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_involved");
+
+                    b.Property<int?>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_id");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("version");
+
+                    b.HasKey("TenantId", "CrashReportId", "ModuleId");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.HasIndex("TenantId", "NexusModsModId");
+
+                    b.ToTable("crash_report_module_info", "crashreport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<string>("ExceptionTypeId")
+                        .HasColumnType("text")
+                        .HasColumnName("exception_type_id");
+
+                    b.HasKey("TenantId", "ExceptionTypeId");
+
+                    b.ToTable("exception_type", "exception");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationDiscordTokensEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("integration_discord_tokens_id");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("access_token");
+
+                    b.Property<DateTimeOffset>("AccessTokenExpiresAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("access_token_expires_at");
+
+                    b.Property<string>("DiscordUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("discord_user_id");
+
+                    b.Property<string>("RefreshToken")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("refresh_token");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.HasIndex("DiscordUserId")
+                        .IsUnique();
+
+                    b.ToTable("integration_discord_tokens", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGToOwnedTenantEntity", b =>
+                {
+                    b.Property<string>("GOGUserId")
+                        .HasColumnType("text")
+                        .HasColumnName("integration_gog_owned_tenant_id");
+
+                    b.Property<byte>("OwnedTenant")
+                        .HasColumnType("smallint")
+                        .HasColumnName("owned_tenant");
+
+                    b.HasKey("GOGUserId", "OwnedTenant");
+
+                    b.HasIndex("OwnedTenant");
+
+                    b.ToTable("integration_gog_owned_tenant", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGTokensEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("integration_gog_tokens_id");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("access_token");
+
+                    b.Property<DateTimeOffset>("AccessTokenExpiresAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("access_token_expires_at");
+
+                    b.Property<string>("GOGUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gog_user_id");
+
+                    b.Property<string>("RefreshToken")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("refresh_token");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.HasIndex("GOGUserId")
+                        .IsUnique();
+
+                    b.ToTable("integration_gog_tokens", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamToOwnedTenantEntity", b =>
+                {
+                    b.Property<string>("SteamUserId")
+                        .HasColumnType("text")
+                        .HasColumnName("integration_steam_owned_tenant_id");
+
+                    b.Property<byte>("OwnedTenant")
+                        .HasColumnType("smallint")
+                        .HasColumnName("owned_tenant");
+
+                    b.HasKey("SteamUserId", "OwnedTenant");
+
+                    b.HasIndex("OwnedTenant");
+
+                    b.ToTable("integration_steam_owned_tenant", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamTokensEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("integration_steam_tokens_id");
+
+                    b.Property<Dictionary<string, string>>("Data")
+                        .IsRequired()
+                        .HasColumnType("hstore")
+                        .HasColumnName("data");
+
+                    b.Property<string>("SteamUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("steam_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.HasIndex("SteamUserId")
+                        .IsUnique();
+
+                    b.ToTable("integration_steam_tokens", "integration");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.HasKey("TenantId", "ModuleId");
+
+                    b.ToTable("module", "module");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsArticleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsArticleId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_article_entity_id");
+
+                    b.Property<DateTimeOffset>("CreateDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("create_date");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("author_id");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("TenantId", "NexusModsArticleId");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.ToTable("nexusmods_article_entity", "nexusmods_article");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_id");
+
+                    b.HasKey("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_mod", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToFileUpdateEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_file_update_id");
+
+                    b.Property<DateTimeOffset>("LastCheckedDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_of_last_check");
+
+                    b.HasKey("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_mod_file_update", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToModuleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_module_id");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<int>("LinkType")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_module_link_type_id");
+
+                    b.Property<DateTimeOffset>("LastUpdateDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_of_last_update");
+
+                    b.HasKey("TenantId", "NexusModsModId", "ModuleId", "LinkType");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.ToTable("nexusmods_mod_module", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToModuleInfoHistoryEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsFileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_file_id");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_module_info_history_id");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<string>("ModuleVersion")
+                        .HasColumnType("text")
+                        .HasColumnName("module_version");
+
+                    b.Property<ModuleInfoModel>("ModuleInfo")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("module_info");
+
+                    b.Property<DateTimeOffset>("UploadDate")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_of_upload");
+
+                    b.HasKey("TenantId", "NexusModsFileId", "NexusModsModId", "ModuleId", "ModuleVersion");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.HasIndex("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_mod_module_info_history", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToNameEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_name_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_mod_name", "nexusmods_mod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToCrashReportEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_crash_report_id");
+
+                    b.Property<Guid>("CrashReportId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_report_id");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("comment");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer")
+                        .HasColumnName("status");
+
+                    b.HasKey("TenantId", "NexusModsUserId", "CrashReportId");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.HasIndex("TenantId", "CrashReportId");
+
+                    b.ToTable("nexusmods_user_crash_report", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_to_discord_id");
+
+                    b.Property<string>("DiscordUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("discord_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_to_integration_discord", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_to_gog_id");
+
+                    b.Property<string>("GOGUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gog_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_to_integration_gog", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_to_steam_id");
+
+                    b.Property<string>("SteamUserId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("steam_user_id");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_to_integration_steam", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToModuleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_module_id");
+
+                    b.Property<string>("ModuleId")
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<int>("LinkType")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_module_link_type_id");
+
+                    b.HasKey("TenantId", "NexusModsUserId", "ModuleId", "LinkType");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.ToTable("nexusmods_user_module", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNameEntity", b =>
+                {
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_name_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_name", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNexusModsModEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_nexusmods_mod_id");
+
+                    b.Property<int>("NexusModsModId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_mod_id");
+
+                    b.Property<int>("LinkType")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_nexusmods_mod_link_type_id");
+
+                    b.HasKey("TenantId", "NexusModsUserId", "NexusModsModId", "LinkType");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.HasIndex("TenantId", "NexusModsModId");
+
+                    b.ToTable("nexusmods_user_nexusmods_mod", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToRoleEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<int>("NexusModsUserId")
+                        .HasColumnType("integer")
+                        .HasColumnName("nexusmods_user_role_id");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role");
+
+                    b.HasKey("TenantId", "NexusModsUserId");
+
+                    b.HasIndex("NexusModsUserId");
+
+                    b.ToTable("nexusmods_user_role", "nexusmods_user");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.QuartzExecutionLogEntity", b =>
+                {
+                    b.Property<string>("RunInstanceId")
+                        .HasColumnType("text")
+                        .HasColumnName("run_instance_id");
+
+                    b.Property<string>("JobName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("job_name");
+
+                    b.Property<string>("JobGroup")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("TriggerName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<DateTimeOffset>("FireTimeUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("fire_time_utc");
+
+                    b.Property<DateTimeOffset>("DateAddedUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date_added_utc");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("text")
+                        .HasColumnName("error_message");
+
+                    b.Property<QuartzExecutionLogDetailEntity>("ExecutionLogDetail")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("log_detail");
+
+                    b.Property<bool?>("IsException")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_exception");
+
+                    b.Property<bool?>("IsSuccess")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_success");
+
+                    b.Property<bool?>("IsVetoed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("is_vetoed");
+
+                    b.Property<TimeSpan>("JobRunTime")
+                        .HasColumnType("interval")
+                        .HasColumnName("job_run_time");
+
+                    b.Property<int>("LogId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("quartz_log_id")
+                        .HasDefaultValueSql("nextval('\"quartz\".\"quartz_log_id_seq\"')");
+
+                    b.Property<string>("MachineName")
+                        .HasColumnType("text")
+                        .HasColumnName("machie_name");
+
+                    b.Property<string>("Result")
+                        .HasColumnType("text")
+                        .HasColumnName("result");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("retry_count");
+
+                    b.Property<string>("ReturnCode")
+                        .HasColumnType("text")
+                        .HasColumnName("return_code");
+
+                    b.Property<DateTimeOffset?>("ScheduleFireTimeUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("schedule_fire_time_utc");
+
+                    b.HasKey("RunInstanceId", "JobName", "JobGroup", "TriggerName", "TriggerGroup", "FireTimeUtc");
+
+                    b.ToTable("quartz_log", "quartz");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsCrashScoreInvolvedEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<Guid>("StatisticsCrashScoreInvolvedId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("crash_score_involved_id");
+
+                    b.Property<string>("GameVersion")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("game_version");
+
+                    b.Property<int>("InvolvedCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("involved_count");
+
+                    b.Property<string>("ModuleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("module_id");
+
+                    b.Property<string>("ModuleVersion")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("module_version");
+
+                    b.Property<int>("NotInvolvedCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("not_involved_count");
+
+                    b.Property<int>("RawValue")
+                        .HasColumnType("integer")
+                        .HasColumnName("value");
+
+                    b.Property<double>("Score")
+                        .HasColumnType("double precision")
+                        .HasColumnName("crash_score");
+
+                    b.Property<int>("TotalCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("total_count");
+
+                    b.HasKey("TenantId", "StatisticsCrashScoreInvolvedId");
+
+                    b.HasIndex("TenantId", "ModuleId");
+
+                    b.ToTable("crash_score_involved", "statistics");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsTopExceptionsTypeEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant");
+
+                    b.Property<string>("ExceptionTypeId")
+                        .HasColumnType("text")
+                        .HasColumnName("top_exceptions_type_id");
+
+                    b.Property<int>("ExceptionCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("count");
+
+                    b.HasKey("TenantId", "ExceptionTypeId");
+
+                    b.ToTable("top_exceptions_type", "statistics");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", b =>
+                {
+                    b.Property<byte>("TenantId")
+                        .HasColumnType("smallint")
+                        .HasColumnName("tenant_id");
+
+                    b.HasKey("TenantId");
+
+                    b.ToTable("tenant", "tenant");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.AutocompleteEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", "ExceptionType")
+                        .WithMany("ToCrashReports")
+                        .HasForeignKey("TenantId", "ExceptionTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ExceptionType");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportIgnoredFileEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToFileIdEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", "ToCrashReport")
+                        .WithOne("FileId")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToFileIdEntity", "TenantId", "CrashReportId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ToCrashReport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToMetadataEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", "ToCrashReport")
+                        .WithOne("Metadata")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToMetadataEntity", "TenantId", "CrashReportId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ToCrashReport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportToModuleMetadataEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", "ToCrashReport")
+                        .WithMany("ModuleInfos")
+                        .HasForeignKey("TenantId", "CrashReportId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany()
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithMany()
+                        .HasForeignKey("TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Module");
+
+                    b.Navigation("NexusModsMod");
+
+                    b.Navigation("ToCrashReport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationDiscordTokensEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", "UserToDiscord")
+                        .WithOne("ToTokens")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationDiscordTokensEntity", "DiscordUserId")
+                        .HasPrincipalKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", "DiscordUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne()
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationDiscordTokensEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+
+                    b.Navigation("UserToDiscord");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGToOwnedTenantEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", null)
+                        .WithMany("ToOwnedTenants")
+                        .HasForeignKey("GOGUserId")
+                        .HasPrincipalKey("GOGUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("OwnedTenant")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGTokensEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", "UserToGOG")
+                        .WithOne("ToTokens")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGTokensEntity", "GOGUserId")
+                        .HasPrincipalKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", "GOGUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne()
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationGOGTokensEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+
+                    b.Navigation("UserToGOG");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamToOwnedTenantEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("OwnedTenant")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", null)
+                        .WithMany("ToOwnedTenants")
+                        .HasForeignKey("SteamUserId")
+                        .HasPrincipalKey("SteamUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamTokensEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne()
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamTokensEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", "UserToSteam")
+                        .WithOne("ToTokens")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.IntegrationSteamTokensEntity", "SteamUserId")
+                        .HasPrincipalKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", "SteamUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+
+                    b.Navigation("UserToSteam");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsArticleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToArticles")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToFileUpdateEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithOne("FileUpdate")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToFileUpdateEntity", "TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsMod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToModuleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany("ToNexusModsMods")
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithMany("ModuleIds")
+                        .HasForeignKey("TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+
+                    b.Navigation("NexusModsMod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToModuleInfoHistoryEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany()
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithMany()
+                        .HasForeignKey("TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+
+                    b.Navigation("NexusModsMod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToNameEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithOne("Name")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModToNameEntity", "TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsMod");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToCrashReportEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToCrashReports")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", "ToCrashReport")
+                        .WithMany("ToUsers")
+                        .HasForeignKey("TenantId", "CrashReportId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+
+                    b.Navigation("ToCrashReport");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne("ToDiscord")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne("ToGOG")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne("ToSteam")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToModuleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToModules")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany("ToNexusModsUsers")
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNameEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithOne("Name")
+                        .HasForeignKey("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNameEntity", "NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToNexusModsModEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToNexusModsMods")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", "NexusModsMod")
+                        .WithMany("ToNexusModsUsers")
+                        .HasForeignKey("TenantId", "NexusModsModId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsMod");
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToRoleEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", "NexusModsUser")
+                        .WithMany("ToRoles")
+                        .HasForeignKey("NexusModsUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NexusModsUser");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsCrashScoreInvolvedEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", "Module")
+                        .WithMany("ToCrashScore")
+                        .HasForeignKey("TenantId", "ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsTopExceptionsTypeEntity", b =>
+                {
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.TenantEntity", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", "ExceptionType")
+                        .WithMany("ToTopExceptionsTypes")
+                        .HasForeignKey("TenantId", "ExceptionTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ExceptionType");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.CrashReportEntity", b =>
+                {
+                    b.Navigation("FileId");
+
+                    b.Navigation("Metadata");
+
+                    b.Navigation("ModuleInfos");
+
+                    b.Navigation("ToUsers");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ExceptionTypeEntity", b =>
+                {
+                    b.Navigation("ToCrashReports");
+
+                    b.Navigation("ToTopExceptionsTypes");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.ModuleEntity", b =>
+                {
+                    b.Navigation("ToCrashScore");
+
+                    b.Navigation("ToNexusModsMods");
+
+                    b.Navigation("ToNexusModsUsers");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsModEntity", b =>
+                {
+                    b.Navigation("FileUpdate");
+
+                    b.Navigation("ModuleIds");
+
+                    b.Navigation("Name");
+
+                    b.Navigation("ToNexusModsUsers");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserEntity", b =>
+                {
+                    b.Navigation("Name");
+
+                    b.Navigation("ToArticles");
+
+                    b.Navigation("ToCrashReports");
+
+                    b.Navigation("ToDiscord");
+
+                    b.Navigation("ToGOG");
+
+                    b.Navigation("ToModules");
+
+                    b.Navigation("ToNexusModsMods");
+
+                    b.Navigation("ToRoles");
+
+                    b.Navigation("ToSteam");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationDiscordEntity", b =>
+                {
+                    b.Navigation("ToTokens");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationGOGEntity", b =>
+                {
+                    b.Navigation("ToOwnedTenants");
+
+                    b.Navigation("ToTokens");
+                });
+
+            modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.NexusModsUserToIntegrationSteamEntity", b =>
+                {
+                    b.Navigation("ToOwnedTenants");
+
+                    b.Navigation("ToTokens");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/BUTR.Site.NexusMods.Server/Migrations/20231029211041_Quartz.cs b/src/BUTR.Site.NexusMods.Server/Migrations/20231029211041_Quartz.cs
new file mode 100644
index 00000000..1e11629a
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Migrations/20231029211041_Quartz.cs
@@ -0,0 +1,65 @@
+using System;
+using BUTR.Site.NexusMods.Server.Models.Database;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BUTR.Site.NexusMods.Server.Migrations
+{
+    /// <inheritdoc />
+    public partial class Quartz : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.EnsureSchema(
+                name: "quartz");
+
+            migrationBuilder.CreateSequence<int>(
+                name: "quartz_log_id_seq",
+                schema: "quartz");
+
+            migrationBuilder.CreateTable(
+                name: "quartz_log",
+                schema: "quartz",
+                columns: table => new
+                {
+                    run_instance_id = table.Column<string>(type: "text", nullable: false),
+                    job_name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
+                    job_group = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
+                    trigger_name = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
+                    trigger_group = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
+                    fire_time_utc = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    quartz_log_id = table.Column<int>(type: "integer", nullable: false, defaultValueSql: "nextval('\"quartz\".\"quartz_log_id_seq\"')"),
+                    job_run_time = table.Column<TimeSpan>(type: "interval", nullable: false),
+                    schedule_fire_time_utc = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true),
+                    retry_count = table.Column<int>(type: "integer", nullable: false),
+                    is_success = table.Column<bool>(type: "boolean", nullable: true),
+                    is_exception = table.Column<bool>(type: "boolean", nullable: true),
+                    is_vetoed = table.Column<bool>(type: "boolean", nullable: true),
+                    error_message = table.Column<string>(type: "text", nullable: true),
+                    log_detail = table.Column<QuartzExecutionLogDetailEntity>(type: "jsonb", nullable: true),
+                    result = table.Column<string>(type: "text", nullable: true),
+                    return_code = table.Column<string>(type: "text", nullable: true),
+                    date_added_utc = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    machie_name = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_quartz_log", x => new { x.run_instance_id, x.job_name, x.job_group, x.trigger_name, x.trigger_group, x.fire_time_utc });
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "quartz_log",
+                schema: "quartz");
+
+            migrationBuilder.DropSequence(
+                name: "quartz_log_id_seq",
+                schema: "quartz");
+        }
+    }
+}
diff --git a/src/BUTR.Site.NexusMods.Server/Migrations/BaseAppDbContextModelSnapshot.cs b/src/BUTR.Site.NexusMods.Server/Migrations/BaseAppDbContextModelSnapshot.cs
index f632abfb..ca4acfc6 100644
--- a/src/BUTR.Site.NexusMods.Server/Migrations/BaseAppDbContextModelSnapshot.cs
+++ b/src/BUTR.Site.NexusMods.Server/Migrations/BaseAppDbContextModelSnapshot.cs
@@ -19,12 +19,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.0-rc.1.23419.6")
+                .HasAnnotation("ProductVersion", "8.0.0-rc.2.23480.1")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "hstore");
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.HasSequence<int>("quartz_log_id_seq", "quartz");
+
             modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.AutocompleteEntity", b =>
                 {
                     b.Property<byte>("TenantId")
@@ -65,7 +67,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("crash_report_id");
 
-                    b.Property<DateTime>("CreatedAt")
+                    b.Property<DateTimeOffset>("CreatedAt")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("created_at");
 
@@ -374,7 +376,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("nexusmods_article_entity_id");
 
-                    b.Property<DateTime>("CreateDate")
+                    b.Property<DateTimeOffset>("CreateDate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("create_date");
 
@@ -419,7 +421,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("nexusmods_mod_file_update_id");
 
-                    b.Property<DateTime>("LastCheckedDate")
+                    b.Property<DateTimeOffset>("LastCheckedDate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_of_last_check");
 
@@ -446,7 +448,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("nexusmods_mod_module_link_type_id");
 
-                    b.Property<DateTime>("LastUpdateDate")
+                    b.Property<DateTimeOffset>("LastUpdateDate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_of_last_update");
 
@@ -469,7 +471,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<int>("NexusModsModId")
                         .HasColumnType("integer")
-                        .HasColumnName("nexusmods_mod_name_id");
+                        .HasColumnName("nexusmods_mod_module_info_history_id");
 
                     b.Property<string>("ModuleId")
                         .HasColumnType("text")
@@ -484,7 +486,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("jsonb")
                         .HasColumnName("module_info");
 
-                    b.Property<DateTime>("UploadDate")
+                    b.Property<DateTimeOffset>("UploadDate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_of_upload");
 
@@ -702,12 +704,33 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.QuartzExecutionLogEntity", b =>
                 {
-                    b.Property<long>("LogId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint")
-                        .HasColumnName("quartz_execution_log_id");
+                    b.Property<string>("RunInstanceId")
+                        .HasColumnType("text")
+                        .HasColumnName("run_instance_id");
+
+                    b.Property<string>("JobName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("job_name");
 
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("LogId"));
+                    b.Property<string>("JobGroup")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("TriggerName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<DateTimeOffset>("FireTimeUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("fire_time_utc");
 
                     b.Property<DateTimeOffset>("DateAddedUtc")
                         .HasColumnType("timestamp with time zone")
@@ -719,11 +742,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<QuartzExecutionLogDetailEntity>("ExecutionLogDetail")
                         .HasColumnType("jsonb")
-                        .HasColumnName("execution_log_detail");
-
-                    b.Property<DateTimeOffset?>("FireTimeUtc")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("fire_time_utc");
+                        .HasColumnName("log_detail");
 
                     b.Property<bool?>("IsException")
                         .HasColumnType("boolean")
@@ -737,25 +756,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("boolean")
                         .HasColumnName("is_vetoed");
 
-                    b.Property<string>("JobGroup")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasColumnName("job_group");
-
-                    b.Property<string>("JobName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasColumnName("job_name");
-
-                    b.Property<TimeSpan?>("JobRunTime")
+                    b.Property<TimeSpan>("JobRunTime")
                         .HasColumnType("interval")
                         .HasColumnName("job_run_time");
 
-                    b.Property<string>("LogType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("log_type");
+                    b.Property<int>("LogId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("quartz_log_id")
+                        .HasDefaultValueSql("nextval('\"quartz\".\"quartz_log_id_seq\"')");
 
                     b.Property<string>("MachineName")
                         .HasColumnType("text")
@@ -765,7 +774,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("text")
                         .HasColumnName("result");
 
-                    b.Property<int?>("RetryCount")
+                    b.Property<int>("RetryCount")
                         .HasColumnType("integer")
                         .HasColumnName("retry_count");
 
@@ -773,33 +782,13 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("text")
                         .HasColumnName("return_code");
 
-                    b.Property<string>("RunInstanceId")
-                        .HasColumnType("text")
-                        .HasColumnName("run_instance_id");
-
                     b.Property<DateTimeOffset?>("ScheduleFireTimeUtc")
                         .HasColumnType("timestamp with time zone")
-                        .HasColumnName("_schedule_fire_time_utc");
-
-                    b.Property<string>("TriggerGroup")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasColumnName("trigger_group");
-
-                    b.Property<string>("TriggerName")
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)")
-                        .HasColumnName("trigger_name");
-
-                    b.HasKey("LogId");
-
-                    b.HasIndex("RunInstanceId");
-
-                    b.HasIndex("DateAddedUtc", "LogType");
+                        .HasColumnName("schedule_fire_time_utc");
 
-                    b.HasIndex("TriggerName", "TriggerGroup", "JobName", "JobGroup", "DateAddedUtc");
+                    b.HasKey("RunInstanceId", "JobName", "JobGroup", "TriggerName", "TriggerGroup", "FireTimeUtc");
 
-                    b.ToTable("quartz_execution_log", "quartz");
+                    b.ToTable("quartz_log", "quartz");
                 });
 
             modelBuilder.Entity("BUTR.Site.NexusMods.Server.Models.Database.StatisticsCrashScoreInvolvedEntity", b =>
diff --git a/src/BUTR.Site.NexusMods.Server/Models/API/MessageResponse.cs b/src/BUTR.Site.NexusMods.Server/Models/API/MessageResponse.cs
index e5915c34..122dfed5 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/API/MessageResponse.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/API/MessageResponse.cs
@@ -1,10 +1,12 @@
-namespace BUTR.Site.NexusMods.Server.Models.API;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BUTR.Site.NexusMods.Server.Models.API;
 
 public abstract record APIResponse
 {
-    public static APIResponse<T?> From<T>(T? data, string error = "") => new(data, error);
-    public static APIResponse<T?> Error<T>(string error) => new(default, error);
+    public static APIResponse<T?> FromResult<T>(T? data, ProblemDetails? error = null) => new(data, error);
+    public static APIResponse<T?> FromError<T>(ProblemDetails error) => new(default, error);
 }
-public record APIResponse<T>(T? Data, string HumanReadableError) : APIResponse;
+public record APIResponse<T>(T? Value, ProblemDetails? Error) : APIResponse;
 
-public record APIStreamingResponse(string HumanReadableError) : APIResponse;
\ No newline at end of file
+public record APIStreamingResponse(ProblemDetails? Error) : APIResponse;
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/API/NexusModsModModel.cs b/src/BUTR.Site.NexusMods.Server/Models/API/NexusModsModModel.cs
deleted file mode 100644
index 8bad4faa..00000000
--- a/src/BUTR.Site.NexusMods.Server/Models/API/NexusModsModModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.Immutable;
-
-namespace BUTR.Site.NexusMods.Server.Models.API;
-
-public sealed record NexusModsModModel(
-    NexusModsModId NexusModsModId,
-    string Name,
-    ImmutableArray<NexusModsUserId> AllowedNexusModsUserIds,
-    ImmutableArray<NexusModsUserId> ManuallyLinkedNexusModsUserIds,
-    ImmutableArray<ModuleId> ManuallyLinkedModuleIds,
-    ImmutableArray<ModuleId> KnownModuleIds);
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/API/PagingData.cs b/src/BUTR.Site.NexusMods.Server/Models/API/PagingData.cs
index e8073ffb..c444fe78 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/API/PagingData.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/API/PagingData.cs
@@ -12,7 +12,7 @@ namespace BUTR.Site.NexusMods.Server.Models.API;
 /// <summary>
 /// This is an optimized class for json serialization of the Pagination functionality.
 /// We start with the <see cref="BUTR.Site.NexusMods.Server.Models.Database.Paging{T}"/> class.
-/// With the EF Core query provided, it will capture the current time and start database read with <see cref="System.Linq.Queryable.Count"/>.
+/// With the EF Core query provided, it will capture the current time and start database read with <see cref="System.Linq.Queryable.Count{T}(System.Linq.IQueryable{T})"/>.
 /// The Read of the data will not be yet done. It will start lazily after the json serializer will start to serialize it.
 /// After the serialization is done, our Async wrappers will capture the end time to be consumed by json next.
 /// It's quite complex, but we avoid data bufferization on the server and also start to send the data to the client as early as possible.
@@ -74,7 +74,7 @@ public async ValueTask<bool> MoveNextAsync()
     [JsonIgnore]
     private long EndTime { get; set; }
 
-    private PagingAdditionalMetadata? _additionalMetadata = default!;
+    private PagingAdditionalMetadata? _additionalMetadata;
     [JsonPropertyOrder(3)]
     public PagingAdditionalMetadata AdditionalMetadata => _additionalMetadata ??= new()
     {
diff --git a/src/BUTR.Site.NexusMods.Server/Models/API/ProfileModel.cs b/src/BUTR.Site.NexusMods.Server/Models/API/ProfileModel.cs
index 3f652126..2e6b3487 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/API/ProfileModel.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/API/ProfileModel.cs
@@ -18,5 +18,5 @@ public sealed record ProfileModel
 
     public required bool HasTenantGame { get; init; }
 
-    public ImmutableDictionary<TenantId, string> AvailableTenants { get; init; }
+    public required ImmutableArray<ProfileTenantModel> AvailableTenants { get; init; }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/API/ProfileTenantModel.cs b/src/BUTR.Site.NexusMods.Server/Models/API/ProfileTenantModel.cs
new file mode 100644
index 00000000..0b1e659f
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Models/API/ProfileTenantModel.cs
@@ -0,0 +1,7 @@
+namespace BUTR.Site.NexusMods.Server.Models.API;
+
+public sealed record ProfileTenantModel
+{
+    public required TenantId TenantId { get; init; }
+    public required string Name { get; init; }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/CrashReportEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/CrashReportEntity.cs
index 21ef28c0..266a5ad6 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/CrashReportEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/CrashReportEntity.cs
@@ -19,9 +19,9 @@ public sealed record CrashReportEntity : IEntityWithTenant
 
     public required ExceptionTypeEntity ExceptionType { get; init; }
 
-    public required string Exception { get; init; } = string.Empty;
+    public required string Exception { get; init; }
 
-    public required DateTime CreatedAt { get; init; } = DateTime.MinValue;
+    public required DateTimeOffset CreatedAt { get; init; }
 
     public required CrashReportUrl Url { get; init; }
 
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/IEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/IEntity.cs
index 8211ea4e..ee71ceb4 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/IEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/IEntity.cs
@@ -1,5 +1,3 @@
 namespace BUTR.Site.NexusMods.Server.Models.Database;
 
-public interface IEntity
-{
-}
\ No newline at end of file
+public interface IEntity;
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/Json/ModuleInfoModel.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/Json/ModuleInfoModel.cs
index a70806f0..f02dec28 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/Json/ModuleInfoModel.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/Json/ModuleInfoModel.cs
@@ -1,5 +1,6 @@
 using Bannerlord.ModuleManager;
 
+using System.Collections.Generic;
 using System.Linq;
 
 namespace BUTR.Site.NexusMods.Server.Models.Database;
@@ -54,4 +55,38 @@ public sealed record ModuleInfoModel
             }).ToArray(),
         }).ToArray(),
     };
+
+    public static ModuleInfoExtended Create(ModuleInfoModel moduleInfo) => new()
+    {
+        Id = moduleInfo.Id,
+        Name = moduleInfo.Name,
+        IsOfficial = moduleInfo.IsOfficial,
+        Version = ApplicationVersion.TryParse(moduleInfo.Version, out var v) ? v : ApplicationVersion.Empty,
+        IsSingleplayerModule = moduleInfo.IsSingleplayerModule,
+        IsMultiplayerModule = moduleInfo.IsMultiplayerModule,
+        IsServerModule = moduleInfo.IsServerModule,
+        Url = moduleInfo.Url,
+        UpdateInfo = moduleInfo.UpdateInfo,
+        DependentModuleMetadatas = moduleInfo.DependentModuleMetadatas.Select(y => new DependentModuleMetadata
+        {
+            Id = y.Id,
+            LoadType = y.Type == "LoadAfterThis" ? LoadType.LoadAfterThis : y.Type == "LoadBeforeThis" ? LoadType.LoadBeforeThis : LoadType.None,
+            IsOptional = y.IsOptional,
+            Version = ApplicationVersion.TryParse(y.Version, out var yV) ? yV : ApplicationVersion.Empty,
+            VersionRange = y.VersionRange != null ? new ApplicationVersionRange
+            {
+                Min = ApplicationVersion.TryParse(y.VersionRange?.Min, out var yVMin) ? yVMin : ApplicationVersion.Empty,
+                Max = ApplicationVersion.TryParse(y.VersionRange?.Max, out var yVMax) ? yVMax : ApplicationVersion.Empty,
+            } : ApplicationVersionRange.Empty,
+        }).ToArray(),
+        SubModules = moduleInfo.SubModules.Select(y => new SubModuleInfoExtended
+        {
+            Name = y.Name,
+            DLLName = y.DLLName,
+            Assemblies = y.Assemblies.ToArray(),
+            SubModuleClassType = y.SubModuleClassType,
+            Tags = y.Tags.ToDictionary(x => x.Key, x => (IReadOnlyList<string>) x.Value),
+        }).ToArray(),
+    };
+
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsArticleEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsArticleEntity.cs
index 41c5453e..6385a2dc 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsArticleEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsArticleEntity.cs
@@ -12,7 +12,7 @@ public sealed record NexusModsArticleEntity : IEntityWithTenant
 
     public required NexusModsUserEntity NexusModsUser { get; init; }
 
-    public required DateTime CreateDate { get; init; }
+    public required DateTimeOffset CreateDate { get; init; }
 
     public override int GetHashCode() => HashCode.Combine(TenantId, NexusModsArticleId, Title, NexusModsUser.NexusModsUserId, CreateDate);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModEntity.cs
index e578bbde..68e9561b 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModEntity.cs
@@ -24,7 +24,7 @@ private NexusModsModEntity() { }
     [SetsRequiredMembers]
     private NexusModsModEntity(TenantId tenant, NexusModsModId modId) : this() => (TenantId,NexusModsModId) = (tenant, modId);
     [SetsRequiredMembers]
-    private NexusModsModEntity(TenantId tenant, NexusModsModId modId, DateTime lastCheckedDate) : this(tenant, modId) => FileUpdate = new()
+    private NexusModsModEntity(TenantId tenant, NexusModsModId modId, DateTimeOffset lastCheckedDate) : this(tenant, modId) => FileUpdate = new()
     {
         TenantId = tenant,
         NexusModsMod = this,
@@ -32,7 +32,7 @@ private NexusModsModEntity() { }
     };
 
     public static NexusModsModEntity Create(TenantId tenant, NexusModsModId modId) => new(tenant, modId);
-    public static NexusModsModEntity Create(TenantId tenant, NexusModsModId modId, DateTime lastCheckedDate) => new(tenant, modId, lastCheckedDate);
+    public static NexusModsModEntity Create(TenantId tenant, NexusModsModId modId, DateTimeOffset lastCheckedDate) => new(tenant, modId, lastCheckedDate);
 }
 
 /*
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToFileUpdateEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToFileUpdateEntity.cs
index 7cee6301..b906f5b5 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToFileUpdateEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToFileUpdateEntity.cs
@@ -8,7 +8,7 @@ public sealed record NexusModsModToFileUpdateEntity : IEntityWithTenant
 
     public required NexusModsModEntity NexusModsMod { get; init; }
 
-    public required DateTime LastCheckedDate { get; init; }
+    public required DateTimeOffset LastCheckedDate { get; init; }
 
     public override int GetHashCode() => HashCode.Combine(TenantId, NexusModsMod.NexusModsModId, LastCheckedDate);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToModuleEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToModuleEntity.cs
index 36f710be..be61b8d1 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToModuleEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToModuleEntity.cs
@@ -12,7 +12,7 @@ public sealed record NexusModsModToModuleEntity : IEntityWithTenant
 
     public required NexusModsModToModuleLinkType LinkType { get; init; }
 
-    public required DateTime LastUpdateDate { get; init; }
+    public required DateTimeOffset LastUpdateDate { get; init; }
 
     public override int GetHashCode() => HashCode.Combine(TenantId, NexusModsMod.NexusModsModId, Module.ModuleId, LinkType, LastUpdateDate);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToModuleInfoHistoryEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToModuleInfoHistoryEntity.cs
index 7286cb07..5dd72fb6 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToModuleInfoHistoryEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsModToModuleInfoHistoryEntity.cs
@@ -9,7 +9,7 @@ public sealed record NexusModsModToModuleInfoHistoryEntity : IEntityWithTenant
     public required ModuleEntity Module { get; init; }
     public required ModuleVersion ModuleVersion { get; init; }
     public required NexusModsFileId NexusModsFileId { get; init; }
-    public required DateTime UploadDate { get; init; }
+    public required DateTimeOffset UploadDate { get; init; }
 
     public required ModuleInfoModel ModuleInfo { get; init; }
 
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserEntity.cs
index 97547dc2..76ae249a 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserEntity.cs
@@ -28,18 +28,18 @@ private NexusModsUserEntity() { }
     private NexusModsUserEntity(NexusModsUserId userId, NexusModsUserName? name = null, TenantId? tenant = null, ApplicationRole? role = null) : this()
     {
         NexusModsUserId = userId;
-        Name = name is not null ? new()
+        Name = name is { } nameVal ? new()
         {
             NexusModsUser = this,
-            Name = name.Value,
+            Name = nameVal,
         } : null;
-        if (tenant is not null && role is not null)
+        if (tenant is { } tenantVal && role is { } roleVal)
         {
             ToRoles.Add(new()
             {
                 NexusModsUser = this,
-                TenantId = tenant.Value,
-                Role = role.Value,
+                TenantId = tenantVal,
+                Role = roleVal,
             });
         }
     }
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserToIntegrationGOGEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserToIntegrationGOGEntity.cs
index f91efa2b..8131fc5e 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserToIntegrationGOGEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserToIntegrationGOGEntity.cs
@@ -9,7 +9,7 @@ public sealed record NexusModsUserToIntegrationGOGEntity : IEntity
     public IntegrationGOGTokensEntity? ToTokens { get; init; }
 
     public required string GOGUserId { get; init; }
-    public ICollection<IntegrationGOGToOwnedTenantEntity> ToOwnedTenants { get; init; }
+    public ICollection<IntegrationGOGToOwnedTenantEntity> ToOwnedTenants { get; init; } = new List<IntegrationGOGToOwnedTenantEntity>();
 
     public override int GetHashCode() => HashCode.Combine(NexusModsUser.NexusModsUserId, GOGUserId);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserToIntegrationSteamEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserToIntegrationSteamEntity.cs
index bda412f2..8aa54d53 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserToIntegrationSteamEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/NexusModsUserToIntegrationSteamEntity.cs
@@ -9,7 +9,7 @@ public sealed record NexusModsUserToIntegrationSteamEntity : IEntity
     public IntegrationSteamTokensEntity? ToTokens { get; init; }
 
     public required string SteamUserId { get; init; }
-    public ICollection<IntegrationSteamToOwnedTenantEntity> ToOwnedTenants { get; init; }
+    public ICollection<IntegrationSteamToOwnedTenantEntity> ToOwnedTenants { get; init; } = new List<IntegrationSteamToOwnedTenantEntity>();
 
 
     public override int GetHashCode() => HashCode.Combine(NexusModsUser.NexusModsUserId, SteamUserId);
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzExecutionLogDetailEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzExecutionLogDetailEntity.cs
index d69d0e42..96f40c82 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzExecutionLogDetailEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzExecutionLogDetailEntity.cs
@@ -2,8 +2,9 @@
 
 public sealed record QuartzExecutionLogDetailEntity
 {
-    public string? ExecutionDetails { get; set; }
-    public string? ErrorStackTrace { get; set; }
-    public int? ErrorCode { get; set; }
-    public string? ErrorHelpLink { get; set; }
+    public required string? ExecutionDetails { get; init; }
+
+    public required int? ErrorCode { get; init; }
+    public required string? ErrorStackTrace { get; init; }
+    public required string? ErrorHelpLink { get; init; }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzExecutionLogEntity.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzExecutionLogEntity.cs
index 691c5f22..8159e5a0 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzExecutionLogEntity.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzExecutionLogEntity.cs
@@ -4,26 +4,30 @@ namespace BUTR.Site.NexusMods.Server.Models.Database;
 
 public sealed record QuartzExecutionLogEntity : IEntity
 {
-    public long LogId { get; init; }
-    public string? RunInstanceId { get; init; }
-    public required QuartzLogType LogType { get; init; }
-    public string? JobName { get; set; }
-    public string? JobGroup { get; set; }
-    public string? TriggerName { get; init; }
-    public string? TriggerGroup { get; init; }
-    public DateTimeOffset? ScheduleFireTimeUtc { get; init; }
-    public DateTimeOffset? FireTimeUtc { get; init; }
-    public TimeSpan? JobRunTime { get; set; }
-    public int? RetryCount { get; init; }
-    public string? Result { get; set; }
-    public string? ErrorMessage { get; set; }
-    public bool? IsVetoed { get; set; }
-    public bool? IsException { get; set; }
-    public bool? IsSuccess { get; set; }
-    public string? ReturnCode { get; set; }
-    public DateTimeOffset DateAddedUtc { get; init; } = DateTimeOffset.UtcNow;
+    public required int LogId { get; init; }
+    public required string RunInstanceId { get; init; }
+    public required string JobName { get; init; }
+    public required string JobGroup { get; init; }
+    public required string TriggerName { get; init; }
+    public required string TriggerGroup { get; init; }
+    public required DateTimeOffset FireTimeUtc { get; init; }
+    public required TimeSpan JobRunTime { get; init; }
+
+    public required DateTimeOffset? ScheduleFireTimeUtc { get; init; }
+
+    public required int RetryCount { get; init; }
+
+    public required bool? IsSuccess { get; set; }
+    public required bool? IsException { get; set; }
+    public required bool? IsVetoed { get; set; }
+
+    public required string? ErrorMessage { get; set; }
     public QuartzExecutionLogDetailEntity? ExecutionLogDetail { get; set; }
+    public required string? Result { get; set; }
+    public required string? ReturnCode { get; set; }
+
+    public DateTimeOffset DateAddedUtc { get; init; } = DateTimeOffset.UtcNow;
     public string? MachineName { get; set; } = Environment.MachineName;
 
-    public DateTimeOffset? GetFinishTimeUtc() => FireTimeUtc?.Add(JobRunTime ?? TimeSpan.Zero);
+    public DateTimeOffset? GetFinishTimeUtc() => FireTimeUtc.Add(JobRunTime);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzLogType.cs b/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzLogType.cs
deleted file mode 100644
index 933e97cb..00000000
--- a/src/BUTR.Site.NexusMods.Server/Models/Database/QuartzLogType.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace BUTR.Site.NexusMods.Server.Models.Database;
-
-public enum QuartzLogType
-{
-    ScheduleJob = 1,
-    Trigger = 2,
-    System = 3,
-}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/FileIdDate.cs b/src/BUTR.Site.NexusMods.Server/Models/FileIdDate.cs
index 1cd6eb51..4560de27 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/FileIdDate.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/FileIdDate.cs
@@ -4,7 +4,7 @@
 namespace BUTR.Site.NexusMods.Server.Models;
 
 public sealed record CrashReportFileMetadata(
-    [property: JsonPropertyName("file")] CrashReportFileId File,
-    [property: JsonPropertyName("id")] CrashReportId Id,
+    [property: JsonPropertyName("file")] CrashReportFileId FileId,
+    [property: JsonPropertyName("id")] CrashReportId CrashReportId,
     [property: JsonPropertyName("version")] byte Version,
     [property: JsonPropertyName("date")] DateTime Date);
diff --git a/src/BUTR.Site.NexusMods.Server/Models/GOGUserInfo.cs b/src/BUTR.Site.NexusMods.Server/Models/GOGUserInfo.cs
deleted file mode 100644
index 9e8e8710..00000000
--- a/src/BUTR.Site.NexusMods.Server/Models/GOGUserInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace BUTR.Site.NexusMods.Server.Models;
-
-public sealed record GOGUserInfo(
-    [property: JsonPropertyName("id")] string Id,
-    [property: JsonPropertyName("username")] string Username);
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/NexusModsModFileParserResult.cs b/src/BUTR.Site.NexusMods.Server/Models/NexusModsModFileParserResult.cs
deleted file mode 100644
index 7411eff1..00000000
--- a/src/BUTR.Site.NexusMods.Server/Models/NexusModsModFileParserResult.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Bannerlord.ModuleManager;
-
-using System;
-
-namespace BUTR.Site.NexusMods.Server.Models;
-
-public sealed record NexusModsModFileParserResult
-{
-    public required ModuleInfoExtended ModuleInfo { get; init; }
-    public required NexusModsFileId FileId { get; init; }
-    public required DateTime Uploaded { get; init; }
-}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Quartz/EventArgs.cs b/src/BUTR.Site.NexusMods.Server/Models/Quartz/QuartzEventArgs.cs
similarity index 63%
rename from src/BUTR.Site.NexusMods.Server/Models/Quartz/EventArgs.cs
rename to src/BUTR.Site.NexusMods.Server/Models/Quartz/QuartzEventArgs.cs
index f361d17c..dd0f64cd 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Quartz/EventArgs.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Quartz/QuartzEventArgs.cs
@@ -1,14 +1,14 @@
-using System;
+using System;
 using System.Threading;
 
 namespace BUTR.Site.NexusMods.Server.Models.Quartz;
 
-public class EventArgs<TArgs> : EventArgs
+public class QuartzEventArgs<TArgs> : EventArgs
 {
     public TArgs Args { get; init; }
     public CancellationToken CancelToken { get; init; }
 
-    public EventArgs(TArgs args, CancellationToken cancelToken = default)
+    public QuartzEventArgs(TArgs args, CancellationToken cancelToken = default)
     {
         Args = args;
         CancelToken = cancelToken;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Quartz/SchedulerErrorEventArgs.cs b/src/BUTR.Site.NexusMods.Server/Models/Quartz/SchedulerErrorEventArgs.cs
deleted file mode 100644
index bef44056..00000000
--- a/src/BUTR.Site.NexusMods.Server/Models/Quartz/SchedulerErrorEventArgs.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Quartz;
-
-using System;
-using System.Threading;
-
-namespace BUTR.Site.NexusMods.Server.Models.Quartz;
-
-public class SchedulerErrorEventArgs : EventArgs
-{
-    public string ErrorMessage { get; init; } = null!;
-    public SchedulerException Exception { get; init; } = null!;
-    public CancellationToken CancelToken { get; init; }
-}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/SteamUserInfo.cs b/src/BUTR.Site.NexusMods.Server/Models/SteamUserInfo.cs
deleted file mode 100644
index 55c850eb..00000000
--- a/src/BUTR.Site.NexusMods.Server/Models/SteamUserInfo.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace BUTR.Site.NexusMods.Server.Models;
-
-public sealed record SteamUserInfo(
-    [property: JsonPropertyName("id")] string Id,
-    [property: JsonPropertyName("username")] string Username);
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ApplicationRole.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/ApplicationRole.cs
index 81373e19..279e6799 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ApplicationRole.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/ApplicationRole.cs
@@ -1,12 +1,37 @@
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
+using TType = ApplicationRole;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None, deserializationStrictness: DeserializationStrictness.AllowKnownInstances)]
 [Instance("Anonymous", ApplicationRoles.Anonymous)]
 [Instance("User", ApplicationRoles.User)]
 [Instance("Moderator", ApplicationRoles.Moderator)]
 [Instance("Administrator", ApplicationRoles.Administrator)]
-public readonly partial struct ApplicationRole { }
\ No newline at end of file
+public readonly partial record struct ApplicationRole : IVogen<TType, TValueType>, IHasDefaultValue<TType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType DefaultValue => Anonymous;
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportFileId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportFileId.cs
index 777cf1a6..6b919057 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportFileId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportFileId.cs
@@ -1,6 +1,30 @@
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct CrashReportFileId { }
\ No newline at end of file
+using TType = CrashReportFileId;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct CrashReportFileId : IVogen<TType, TValueType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportId.cs
index 0c900b57..a42bbbed 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportId.cs
@@ -1,9 +1,31 @@
-using System;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<Guid>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-//[StronglyTypedId(StronglyTypedIdBackingType.Guid, StronglyTypedIdConverter.Default | StronglyTypedIdConverter.SystemTextJson | StronglyTypedIdConverter.EfCoreValueConverter)]
-public readonly partial struct CrashReportId { }
\ No newline at end of file
+using TType = CrashReportId;
+using TValueType = Guid;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct CrashReportId : IVogen<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IHasRandomValueGenerator<TType, TValueType, Random>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType NewRandomValue(Random? random) => From(Guid.NewGuid());
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportUrl.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportUrl.cs
index a25f96ab..3747dc77 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportUrl.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportUrl.cs
@@ -1,12 +1,32 @@
-using System;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-//[StronglyTypedId(StronglyTypedIdBackingType.String, StronglyTypedIdConverter.Default | StronglyTypedIdConverter.SystemTextJson | StronglyTypedIdConverter.EfCoreValueConverter)]
-public readonly partial struct CrashReportUrl
+using TType = CrashReportUrl;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct CrashReportUrl : IVogen<TType, TValueType>
 {
-    public static CrashReportUrl From(Uri uri) => From(uri.ToString());
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+
+    public static TType From(Uri uri) => From(uri.ToString());
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportVersion.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportVersion.cs
index 5bab7738..3526afa6 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportVersion.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportVersion.cs
@@ -1,6 +1,30 @@
-using Vogen;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
+using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<byte>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct CrashReportVersion { }
\ No newline at end of file
+using TType = CrashReportVersion;
+using TValueType = Byte;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct CrashReportVersion : IVogen<TType, TValueType>, IVogenParsable<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IVogenUtf8SpanParsable<TType, TValueType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ExceptionTypeId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/ExceptionTypeId.cs
index 384756ee..63c7ccfd 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ExceptionTypeId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/ExceptionTypeId.cs
@@ -1,6 +1,30 @@
-using Vogen;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
+using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct ExceptionTypeId { }
\ No newline at end of file
+using TType = ExceptionTypeId;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct ExceptionTypeId : IVogen<TType, TValueType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/GameVersion.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/GameVersion.cs
index 4951f99d..12e41c91 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/GameVersion.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/GameVersion.cs
@@ -1,9 +1,29 @@
-using Vogen;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
+using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct GameVersion
+using TType = GameVersion;
+using TValueType = System.String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct GameVersion : IVogen<TType, TValueType>
 {
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
 
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleId.cs
index cf21ef92..3f2d40ad 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleId.cs
@@ -1,6 +1,30 @@
-using Vogen;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
+using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct ModuleId { }
\ No newline at end of file
+using TType = ModuleId;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct ModuleId : IVogen<TType, TValueType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleVersion.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleVersion.cs
index f20a0435..09ba3de4 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleVersion.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleVersion.cs
@@ -1,6 +1,30 @@
-using Vogen;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
+using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct ModuleVersion { }
\ No newline at end of file
+using TType = ModuleVersion;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct ModuleVersion : IVogen<TType, TValueType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsApiKey.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsApiKey.cs
index 569f4c55..a602770f 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsApiKey.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsApiKey.cs
@@ -1,7 +1,32 @@
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
+using TType = NexusModsApiKey;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
 [Instance("None", "")]
-public readonly partial struct NexusModsApiKey { }
\ No newline at end of file
+public readonly partial record struct NexusModsApiKey : IVogen<TType, TValueType>, IHasDefaultValue<TType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType DefaultValue => None;
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsArticleId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsArticleId.cs
index 607ab2c1..7b996f49 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsArticleId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsArticleId.cs
@@ -1,27 +1,48 @@
-using System;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<int>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct NexusModsArticleId
+using TType = NexusModsArticleId;
+using TValueType = Int32;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+[Instance("None", 0)]
+public readonly partial record struct NexusModsArticleId : IVogen<TType, TValueType>, IVogenParsable<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IVogenUtf8SpanParsable<TType, TValueType>, IHasDefaultValue<TType>
 {
-    public static bool TryParseUrl(string url, out NexusModsArticleId articleId)
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static NexusModsArticleId DefaultValue => None;
+
+    public static bool TryParseUrl(string urlRaw, out TType articleId)
     {
         articleId = From(0);
 
-        if (!url.Contains("nexusmods.com/"))
+        if (!Uri.TryCreate(urlRaw, UriKind.Absolute, out var url))
             return false;
 
-        var str1 = url.Split("nexusmods.com/");
-        if (str1.Length != 2)
+        if (!url.Host.EndsWith("nexusmods.com"))
             return false;
 
-        var split = str1[1].Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-        if (split.Length != 3)
+        if (url.LocalPath.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) is not [ _, _, var articleIdRaw, .. ])
             return false;
 
-        return TryParse(split[2], out articleId);
+        return TryParse(articleIdRaw, out articleId);
     }
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsFileId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsFileId.cs
index 4cfe2982..8fcc74b0 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsFileId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsFileId.cs
@@ -1,6 +1,30 @@
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<int>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct NexusModsFileId { }
\ No newline at end of file
+using TType = NexusModsFileId;
+using TValueType = Int32;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+public readonly partial record struct NexusModsFileId : IVogen<TType, TValueType>, IVogenParsable<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IVogenUtf8SpanParsable<TType, TValueType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsGameDomain.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsGameDomain.cs
index 676dd77a..0703dfaa 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsGameDomain.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsGameDomain.cs
@@ -1,49 +1,60 @@
-using BUTR.Site.NexusMods.Shared.Helpers;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+using BUTR.Site.NexusMods.Shared.Helpers;
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
+using TType = NexusModsGameDomain;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None, deserializationStrictness: DeserializationStrictness.AllowKnownInstances)]
 [Instance("None", "")]
 [Instance(TenantUtils.Bannerlord, TenantUtils.BannerlordGameDomain)]
 [Instance(TenantUtils.Rimworld, TenantUtils.RimworldGameDomain)]
 [Instance(TenantUtils.StardewValley, TenantUtils.StardewValleyGameDomain)]
-public readonly partial struct NexusModsGameDomain
+public readonly partial record struct NexusModsGameDomain : IVogen<TType, TValueType>, IHasDefaultValue<TType>
 {
-    public static IEnumerable<NexusModsGameDomain> Values
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType DefaultValue => None;
+
+    public static IEnumerable<TType> Values
     {
         get
         {
             yield return Bannerlord;
-            //yield return Rimworld;
-            //yield return StardewValley;
+            yield return Rimworld;
+            yield return StardewValley;
         }
     }
 
-    public static bool TryParse(string url, out NexusModsGameDomain gameDomain)
+    public static bool TryParse(string urlRaw, out TType gameDomain)
     {
-        gameDomain = None;
+        gameDomain = DefaultValue;
 
-        if (!url.Contains("nexusmods.com/"))
+        if (!Uri.TryCreate(urlRaw, UriKind.Absolute, out var url))
             return false;
 
-        var str1 = url.Split("nexusmods.com/");
-        if (str1.Length != 2)
+        if (!url.Host.EndsWith("nexusmods.com"))
             return false;
 
-        var split = str1[1].Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-        if (split.Length < 2)
+        if (url.LocalPath.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) is not [ var gameDomainStr, .. ])
             return false;
 
-        gameDomain = From(split[0]);
+        gameDomain = From(gameDomainStr);
         return true;
     }
 
-    public static NexusModsGameDomain FromGameDomain(string? gameDomain)
+    public static TType FromGameDomain(string gameDomain)
     {
         foreach (var nexusModsGameDomain in Values)
         {
@@ -54,5 +65,13 @@ public static NexusModsGameDomain FromGameDomain(string? gameDomain)
         return None;
     }
 
-    public TenantId ToTenant() => TenantId.FromTenant(TenantUtils.FromGameDomainToTenant(Value));
+    public TenantId ToTenant() => TenantUtils.FromGameDomainToTenant(Value) is { } tenantRaw ? TenantId.FromTenant(tenantRaw) : TenantId.None;
+
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsModId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsModId.cs
index c945001a..e9bc2f45 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsModId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsModId.cs
@@ -1,27 +1,48 @@
-using System;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<int>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
-public readonly partial struct NexusModsModId
+using TType = NexusModsModId;
+using TValueType = Int32;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
+[Instance("None", 0)]
+public readonly partial record struct NexusModsModId : IVogen<TType, TValueType>, IVogenParsable<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IVogenUtf8SpanParsable<TType, TValueType>
 {
-    public static bool TryParseUrl(string url, out NexusModsModId modId)
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType DefaultValue => None;
+
+    public static bool TryParseUrl(string urlRaw, out TType modId)
     {
-        modId = From(0);
+        modId = DefaultValue;
 
-        if (!url.Contains("nexusmods.com/"))
+        if (!Uri.TryCreate(urlRaw, UriKind.Absolute, out var url))
             return false;
 
-        var str1 = url.Split("nexusmods.com/");
-        if (str1.Length != 2)
+        if (!url.Host.EndsWith("nexusmods.com"))
             return false;
 
-        var split = str1[1].Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-        if (split.Length != 3)
+        if (url.LocalPath.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) is not [ _, _, var modIdRaw, .. ])
             return false;
 
-        return TryParse(split[2], out modId);
+        return TryParse(modIdRaw, out modId);
     }
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserEMail.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserEMail.cs
index 4504b3b8..97909c9e 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserEMail.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserEMail.cs
@@ -1,7 +1,32 @@
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
+using TType = NexusModsUserEMail;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
 [Instance("Empty", "")]
-public readonly partial struct NexusModsUserEMail { }
\ No newline at end of file
+public readonly partial record struct NexusModsUserEMail : IVogen<TType, TValueType>, IHasDefaultValue<TType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType DefaultValue => Empty;
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserId.cs
index 9b552aef..c3b137e5 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserId.cs
@@ -1,30 +1,50 @@
-using System;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<int>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
+using TType = NexusModsUserId;
+using TValueType = Int32;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
 [Instance("None", 0)]
-public readonly partial struct NexusModsUserId
+public readonly partial record struct NexusModsUserId : IVogen<TType, TValueType>, IVogenParsable<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IVogenUtf8SpanParsable<TType, TValueType>, IHasDefaultValue<TType>
 {
-    public static bool TryParseUrl(string url, out NexusModsUserId userId)
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType DefaultValue => None;
+
+    public static bool TryParseUrl(string urlRaw, out TType userId)
     {
-        userId = From(0);
+        userId = DefaultValue;
 
-        if (!url.Contains("nexusmods.com/"))
+        if (!Uri.TryCreate(urlRaw, UriKind.Absolute, out var url))
             return false;
 
-        var str1 = url.Split("nexusmods.com/");
-        if (str1.Length != 2)
+        if (!url.Host.EndsWith("nexusmods.com"))
             return false;
 
-        var split = str1[1].Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-        if (split.Length != 2)
+        if (url.LocalPath.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) is not [ _, _, var userIdRaw, .. ])
             return false;
 
-        return TryParse(split[1], out userId);
+        return TryParse(userIdRaw, out userId);
     }
 
-    public static NexusModsUserId From(uint id) => From((int) id);
+    public static TType From(uint id) => From((TValueType) id);
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserName.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserName.cs
index 36b05661..64b30f22 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserName.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserName.cs
@@ -1,7 +1,32 @@
-using Vogen;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
+
+using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<string>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
+using TType = NexusModsUserName;
+using TValueType = String;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None)]
 [Instance("Empty", "")]
-public readonly partial struct NexusModsUserName { }
\ No newline at end of file
+public readonly partial record struct NexusModsUserName : IVogen<TType, TValueType>, IHasDefaultValue<TType>
+{
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType DefaultValue => Empty;
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
+
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/TenantId.cs b/src/BUTR.Site.NexusMods.Server/Models/Vogen/TenantId.cs
index f45c677d..3b32e9d2 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/TenantId.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/Vogen/TenantId.cs
@@ -1,19 +1,33 @@
-using BUTR.Site.NexusMods.Shared.Helpers;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
+using BUTR.Site.NexusMods.Shared.Helpers;
 
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 using Vogen;
 
 namespace BUTR.Site.NexusMods.Server.Models;
 
-[ValueObject<byte>(conversions: Conversions.Default | Conversions.EfCoreValueConverter | Conversions.SystemTextJson)]
+using TType = TenantId;
+using TValueType = Byte;
+
+[TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
+[JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
+[ValueObject<TValueType>(conversions: Conversions.None, deserializationStrictness: DeserializationStrictness.AllowKnownInstances)]
 [Instance("None", "0")]
 [Instance(TenantUtils.Bannerlord, TenantUtils.BannerlordId)]
 [Instance(TenantUtils.Rimworld, TenantUtils.RimworldId)]
 [Instance(TenantUtils.StardewValley, TenantUtils.StardewValleyId)]
-public readonly partial struct TenantId
+public readonly partial record struct TenantId : IVogen<TType, TValueType>, IVogenParsable<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IVogenUtf8SpanParsable<TType, TValueType>, IHasDefaultValue<TType>
 {
-    public static IEnumerable<TenantId> Values
+    public static TType Copy(TType instance) => instance with { };
+    public static bool IsInitialized(TType instance) => instance._isInitialized;
+    public static TType DeserializeDangerous(TValueType instance) => Deserialize(instance);
+    public static TType DefaultValue => None;
+
+    public static IEnumerable<TType> Values
     {
         get
         {
@@ -24,18 +38,26 @@ public static IEnumerable<TenantId> Values
         }
     }
 
-    public static TenantId FromTenant(string? tenant)
+    public static TType FromTenant(int tenant)
     {
         foreach (var tenantId in Values)
         {
-            if (tenantId.Value.ToString() == tenant)
+            if (tenantId.Value == tenant)
                 return tenantId;
         }
 
         return None;
     }
 
-    public NexusModsGameDomain ToGameDomain() => NexusModsGameDomain.FromGameDomain(TenantUtils.FromTenantToGameDomain(Value.ToString()));
+    public NexusModsGameDomain ToGameDomain() =>
+        TenantUtils.FromTenantToGameDomain(Value) is { } gameDomainRaw ? NexusModsGameDomain.FromGameDomain(gameDomainRaw) : NexusModsGameDomain.None;
+
+    public string ToName() => TenantUtils.FromTenantToName(Value) ?? string.Empty;
+
+    public static int GetHashCode(TType instance) => VogenDefaults<TType, TValueType>.GetHashCode(instance);
+
+    public static bool Equals(TType left, TType right) => VogenDefaults<TType, TValueType>.Equals(left, right);
+    public static bool Equals(TType left, TType right, IEqualityComparer<TType> comparer) => VogenDefaults<TType, TValueType>.Equals(left, right, comparer);
 
-    public string ToName() => TenantUtils.FromTenantToName(Value.ToString()) ?? string.Empty;
+    public static int CompareTo(TType left, TType right) => VogenDefaults<TType, TValueType>.CompareTo(left, right);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Program.cs b/src/BUTR.Site.NexusMods.Server/Program.cs
index 3f5b52cc..5babe60e 100644
--- a/src/BUTR.Site.NexusMods.Server/Program.cs
+++ b/src/BUTR.Site.NexusMods.Server/Program.cs
@@ -22,8 +22,6 @@
 using System;
 using System.Threading.Tasks;
 
-using Z.EntityFramework.Extensions;
-
 namespace BUTR.Site.NexusMods.Server;
 
 public static class Program
@@ -31,22 +29,22 @@ public static class Program
     private static void PreBulkSaveChanges(DbContext context)
     {
         if (context is AppDbContextRead)
-            throw new NotSupportedException("Write operations not supported with 'AppDbContextRead'!");
+            AppDbContextRead.WriteNotSupported();
     }
     private static void PreBulkOperation(DbContext context, object o) => PreBulkSaveChanges(context);
 
     public static async Task Main(string[] args)
     {
-        EntityFrameworkManager.PreBulkInsert = PreBulkOperation;
-        EntityFrameworkManager.PreBulkDelete = PreBulkOperation;
-        EntityFrameworkManager.PreBulkMerge  = PreBulkOperation;
-        EntityFrameworkManager.PreBulkUpdate = PreBulkOperation;
-        EntityFrameworkManager.PreBulkSynchronize = PreBulkOperation;
-        EntityFrameworkManager.PreBulkSaveChanges = PreBulkSaveChanges;
-        EntityFrameworkManager.ContextFactory = context => context switch
+        Z.EntityFramework.Extensions.EntityFrameworkManager.PreBulkInsert = PreBulkOperation;
+        Z.EntityFramework.Extensions.EntityFrameworkManager.PreBulkDelete = PreBulkOperation;
+        Z.EntityFramework.Extensions.EntityFrameworkManager.PreBulkMerge  = PreBulkOperation;
+        Z.EntityFramework.Extensions.EntityFrameworkManager.PreBulkUpdate = PreBulkOperation;
+        Z.EntityFramework.Extensions.EntityFrameworkManager.PreBulkSynchronize = PreBulkOperation;
+        Z.EntityFramework.Extensions.EntityFrameworkManager.PreBulkSaveChanges = PreBulkSaveChanges;
+        Z.EntityFramework.Extensions.EntityFrameworkManager.ContextFactory = context => context switch
         {
-            AppDbContextRead appDbContextRead => appDbContextRead.Create(),
-            AppDbContextWrite appDbContextWrite => appDbContextWrite.Create(),
+            AppDbContextRead appDbContextRead => appDbContextRead.New(),
+            AppDbContextWrite appDbContextWrite => appDbContextWrite.New(),
             _ => null
         };
 
@@ -66,7 +64,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) => Host
             });
 
             var oltpSection = ctx.Configuration.GetSection("Oltp");
-            if (oltpSection is not null)
+            if (oltpSection != null!)
             {
                 var openTelemetry = services.AddOpenTelemetry()
                     .ConfigureResource(builder =>
@@ -81,7 +79,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) => Host
                         builder.AddTelemetrySdk();
                     });
 
-                var metricsEndpoint = oltpSection.GetValue<string>("MetricsEndpoint");
+                var metricsEndpoint = oltpSection.GetValue<string?>("MetricsEndpoint");
                 if (metricsEndpoint is not null)
                 {
                     var metricsProtocol = oltpSection.GetValue<OtlpExportProtocol>("MetricsProtocol");
@@ -92,10 +90,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) => Host
                             
                         })
                         .AddHttpClientInstrumentation()
-                        .AddAspNetCoreInstrumentation(instrumentationOptions =>
-                        {
-                            
-                        })
+                        .AddAspNetCoreInstrumentation()
                         .AddOtlpExporter(o =>
                         {
                             o.Endpoint = new Uri(metricsEndpoint);
@@ -103,7 +98,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) => Host
                         }));
                 }
 
-                var tracingEndpoint = oltpSection.GetValue<string>("TracingEndpoint");
+                var tracingEndpoint = oltpSection.GetValue<string?>("TracingEndpoint");
                 if (tracingEndpoint is not null)
                 {
                     var tracingProtocol = oltpSection.GetValue<OtlpExportProtocol>("TracingProtocol");
@@ -114,11 +109,11 @@ public static IHostBuilder CreateHostBuilder(string[] args) => Host
                         })
                         .AddNpgsql(instrumentationOptions =>
                         {
-                            
+
                         })
                         .AddGrpcClientInstrumentation(instrumentationOptions =>
                         {
-                            
+
                         })
                         .AddHttpClientInstrumentation(instrumentationOptions =>
                         {
@@ -147,7 +142,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) => Host
         .ConfigureLogging((ctx, builder) =>
         {
             var oltpSection = ctx.Configuration.GetSection("Oltp");
-            if (oltpSection is null) return;
+            if (oltpSection == null!) return;
             
             var loggingEndpoint = oltpSection.GetValue<string>("LoggingEndpoint");
             if (loggingEndpoint is null) return;
diff --git a/src/BUTR.Site.NexusMods.Server/Services/CrashReportBatchedHandler.cs b/src/BUTR.Site.NexusMods.Server/Services/CrashReportBatchedHandler.cs
new file mode 100644
index 00000000..a67b8314
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Services/CrashReportBatchedHandler.cs
@@ -0,0 +1,294 @@
+using BUTR.CrashReport.Bannerlord.Parser;
+using BUTR.CrashReport.Models;
+using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Models.Database;
+using BUTR.Site.NexusMods.Server.Options;
+
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Services;
+
+public sealed class CrashReportBatchedHandler : IAsyncDisposable
+{
+    private record HttpResultEntry(CrashReportFileId FileId, DateTime Date, CrashReportModel? CrashReport);
+
+    private static readonly int ParallelCount = Environment.ProcessorCount / 2;
+
+    private static string GetException(ExceptionModel? exception, bool inner = false) => exception is null ? string.Empty : $"""
+
+         {(inner ? "Inner ": string.Empty)}Exception information
+         Type: {exception.Type}
+         Message: {exception.Message}
+         CallStack:
+         {exception.CallStack}
+
+         {GetException(exception.InnerException, true)}
+         """;
+
+    private Channel<CrashReportFileMetadata> _toDownloadChannel = Channel.CreateBounded<CrashReportFileMetadata>(ParallelCount * 2);
+    private Channel<HttpResultEntry> _httpResultChannel = Channel.CreateBounded<HttpResultEntry>(ParallelCount * 2);
+    private Channel<CrashReportToFileIdEntity> _linkedCrashReportsChannel = Channel.CreateUnbounded<CrashReportToFileIdEntity>();
+    private Channel<CrashReportIgnoredFileEntity> _ignoredCrashReportsChannel = Channel.CreateUnbounded<CrashReportIgnoredFileEntity>();
+
+    private readonly SemaphoreSlim _lock = new(1);
+
+    private readonly ILogger _logger;
+    private readonly CrashReporterOptions _options;
+    private readonly ITenantContextAccessor _tenantContextAccessor;
+    private readonly IAppDbContextFactory _dbContextFactory;
+    private readonly CrashReporterClient _client;
+
+    public CrashReportBatchedHandler(ILogger<CrashReportBatchedHandler> logger, IOptions<CrashReporterOptions> options, ITenantContextAccessor tenantContextAccessor, IAppDbContextFactory dbContextFactory, CrashReporterClient client)
+    {
+        _logger = logger;
+        _options = options.Value;
+        _tenantContextAccessor = tenantContextAccessor;
+        _dbContextFactory = dbContextFactory;
+        _client = client;
+    }
+
+    public async Task HandleBatchAsync(IEnumerable<CrashReportFileMetadata> requests, CancellationToken ct)
+    {
+        await _lock.WaitAsync(ct);
+
+        _toDownloadChannel = Channel.CreateBounded<CrashReportFileMetadata>(ParallelCount * 2);
+        _httpResultChannel = Channel.CreateBounded<HttpResultEntry>(ParallelCount * 2);
+        _linkedCrashReportsChannel = Channel.CreateUnbounded<CrashReportToFileIdEntity>();
+        _ignoredCrashReportsChannel = Channel.CreateUnbounded<CrashReportIgnoredFileEntity>();
+
+        var filterTask = FilterCrashReportsAsync(requests, ct);
+        var downloadTask = DownloadCrashReportsAsync(ct);
+        var writeTask = WriteCrashReportsToDatabaseAsync(ct);
+        await Task.WhenAll(filterTask, downloadTask, writeTask);
+
+        if (filterTask.IsFaulted || downloadTask.IsFaulted || writeTask.IsFaulted)
+            throw new AggregateException(new[] { filterTask.Exception, downloadTask.Exception, writeTask.Exception }.OfType<Exception>());
+
+        _lock.Release();
+    }
+
+    private async Task FilterCrashReportsAsync(IEnumerable<CrashReportFileMetadata> crashReports, CancellationToken ct)
+    {
+        try
+        {
+            var tenant = _tenantContextAccessor.Current;
+            var dbContextRead = await _dbContextFactory.CreateReadAsync(ct);
+
+            var uniqueCrashReports = crashReports.DistinctBy(x => x.CrashReportId).ToArray();
+            var uniqueCrashReportIds = uniqueCrashReports.Select(x => x.CrashReportId).ToArray();
+
+            var existingCrashReportIds = dbContextRead.CrashReports.Where(x => uniqueCrashReportIds.Contains(x.CrashReportId)).Select(x => x.CrashReportId).Distinct().ToArray();
+            var missingCrashReportIds = uniqueCrashReports.ExceptBy(existingCrashReportIds, x => x.CrashReportId).Select(x => x.CrashReportId).ToHashSet();
+
+            var existingLinks = dbContextRead.CrashReportToFileIds.Where(x => existingCrashReportIds.Contains(x.CrashReportId)).Select(x => x.CrashReportId).Distinct().ToArray();
+            var missingLinks = uniqueCrashReports.ExceptBy(existingLinks, x => x.CrashReportId).ToArray();
+            foreach (var missingLink in missingLinks)
+            {
+                await _linkedCrashReportsChannel.Writer.WaitToWriteAsync(ct);
+                await _linkedCrashReportsChannel.Writer.WriteAsync(new CrashReportToFileIdEntity
+                {
+                    TenantId = tenant,
+                    CrashReportId = missingLink.CrashReportId,
+                    FileId = missingLink.FileId,
+                }, ct);
+            }
+
+            var duplicateLinks = dbContextRead.CrashReportToFileIds
+                .Where(x => uniqueCrashReportIds.Contains(x.CrashReportId))
+                .Select(x => new { x.CrashReportId, x.FileId })
+                .AsEnumerable()
+                .Join(uniqueCrashReports, x => new { x.CrashReportId }, x => new { x.CrashReportId }, (x, y) => new { y.CrashReportId, DbFileId = x.FileId, DlFileId = y.FileId })
+                .Where(x => x.DbFileId != x.DlFileId)
+                .Select(x => new { x.CrashReportId, FileId = x.DlFileId })
+                .ToArray();
+            foreach (var duplicateLink in duplicateLinks)
+            {
+                await _ignoredCrashReportsChannel.Writer.WaitToWriteAsync(ct);
+                await _ignoredCrashReportsChannel.Writer.WriteAsync(new CrashReportIgnoredFileEntity
+                {
+                    TenantId = tenant,
+                    Value = duplicateLink.FileId
+                }, ct);
+            }
+
+            var crashReportsToDownload = uniqueCrashReports.Where(x => missingCrashReportIds.Contains(x.CrashReportId)).ToArray();
+            foreach (var crashReport in crashReportsToDownload)
+            {
+                // Handle the crash report further
+                await _toDownloadChannel.Writer.WaitToWriteAsync(ct);
+                await _toDownloadChannel.Writer.WriteAsync(crashReport, ct);
+            }
+        }
+        finally
+        {
+            _toDownloadChannel.Writer.Complete();
+            _linkedCrashReportsChannel.Writer.Complete();
+            _ignoredCrashReportsChannel.Writer.Complete();
+        }
+    }
+
+    private async Task DownloadCrashReportsAsync(CancellationToken ct)
+    {
+        try
+        {
+            var exceptions = new ConcurrentQueue<Exception>();
+            var options = new ParallelOptions { CancellationToken = ct, MaxDegreeOfParallelism = ParallelCount };
+            await Parallel.ForEachAsync(_toDownloadChannel.Reader.ReadAllAsync(ct), options, async (entry, ct2) =>
+            {
+                try
+                {
+                    var (fileId, _, version, date) = entry;
+
+                    CrashReportModel? model;
+                    if (version <= 12)
+                    {
+                        var content = await _client.GetCrashReportAsync(fileId, ct2);
+
+                        try
+                        {
+                            model = CrashReportParser.ParseLegacyHtml(version, content);
+                        }
+                        catch (Exception e)
+                        {
+                            _logger.LogError(e, "Exception while parsing Legacy HTML report {FileId}", fileId);
+                            model = null;
+                        }
+                    }
+                    else
+                    {
+                        model = await _client.GetCrashReportModelAsync(fileId, ct2);
+                    }
+
+                    if (model is null)
+                    {
+                        _logger.LogError("Failed to parse {FileId}", fileId);
+                    }
+
+                    await _httpResultChannel.Writer.WaitToWriteAsync(ct2);
+                    await _httpResultChannel.Writer.WriteAsync(new(fileId, date, model), ct2);
+                }
+                catch (Exception e)
+                {
+                    exceptions.Enqueue(e);
+                }
+            });
+            if (!exceptions.IsEmpty) throw new AggregateException(exceptions);
+        }
+        finally
+        {
+            _httpResultChannel.Writer.Complete();
+        }
+    }
+
+    private async Task WriteCrashReportsToDatabaseAsync(CancellationToken ct)
+    {
+        var tenant = _tenantContextAccessor.Current;
+
+        var dbContextWrite = await _dbContextFactory.CreateWriteAsync(ct);
+        var entityFactory = dbContextWrite.GetEntityFactory();
+
+        var uniqueCrashReportIds = new HashSet<CrashReportId>();
+
+        var ignoredCrashReportFileEntities = new List<CrashReportIgnoredFileEntity>();
+
+        var failedCrashReportFileIds = new HashSet<CrashReportFileId>();
+
+        var crashReportsBuilder = ImmutableArray.CreateBuilder<CrashReportEntity>();
+        var crashReportMetadatasBuilder = ImmutableArray.CreateBuilder<CrashReportToMetadataEntity>();
+        var crashReportModulesBuilder = ImmutableArray.CreateBuilder<CrashReportToModuleMetadataEntity>();
+        await foreach (var (fileId, date, report) in _httpResultChannel.Reader.ReadAllAsync(ct))
+        {
+            if (report is null)
+            {
+                failedCrashReportFileIds.Add(fileId);
+                return;
+            }
+
+            var crashReportId = CrashReportId.From(report.Id);
+
+            if (uniqueCrashReportIds.Contains(crashReportId))
+            {
+                ignoredCrashReportFileEntities.Add(new CrashReportIgnoredFileEntity
+                {
+                    TenantId = tenant,
+                    Value = fileId
+                });
+                continue;
+            }
+
+            uniqueCrashReportIds.Add(crashReportId);
+
+            var butrLoaderVersion = report.Metadata.AdditionalMetadata.FirstOrDefault(x => x.Key == "BUTRLoaderVersion")?.Value;
+            var blseVersion = report.Metadata.AdditionalMetadata.FirstOrDefault(x => x.Key == "BLSEVersion")?.Value;
+            var launcherExVersion = report.Metadata.AdditionalMetadata.FirstOrDefault(x => x.Key == "LauncherExVersion")?.Value;
+
+            crashReportsBuilder.Add(new CrashReportEntity
+            {
+                TenantId = tenant,
+                CrashReportId = crashReportId,
+                Url = CrashReportUrl.From(new Uri(new Uri(_options.Endpoint), fileId.ToString())),
+                Version = CrashReportVersion.From(report.Version),
+                GameVersion = GameVersion.From(report.GameVersion),
+                ExceptionType = entityFactory.GetOrCreateExceptionType(ExceptionTypeId.From(report.Exception.Type)),
+                Exception = GetException(report.Exception),
+                CreatedAt = fileId.Value.Length == 8 ? DateTimeOffset.UnixEpoch.ToUniversalTime() : date.ToUniversalTime(),
+            });
+            crashReportMetadatasBuilder.Add(new CrashReportToMetadataEntity
+            {
+                TenantId = tenant,
+                CrashReportId = crashReportId,
+                LauncherType = string.IsNullOrEmpty(report.Metadata.LauncherType) ? null : report.Metadata.LauncherType,
+                LauncherVersion = string.IsNullOrEmpty(report.Metadata.LauncherVersion) ? null : report.Metadata.LauncherVersion,
+                Runtime = string.IsNullOrEmpty(report.Metadata.Runtime) ? null : report.Metadata.Runtime,
+                BUTRLoaderVersion = butrLoaderVersion,
+                BLSEVersion = blseVersion,
+                LauncherExVersion = launcherExVersion,
+            });
+            crashReportModulesBuilder.AddRange(report.Modules.Select(x => new CrashReportToModuleMetadataEntity
+            {
+                TenantId = tenant,
+                CrashReportId = crashReportId,
+                Module = entityFactory.GetOrCreateModule(ModuleId.From(x.Id)),
+                Version = ModuleVersion.From(x.Version),
+                NexusModsMod = NexusModsModId.TryParseUrl(x.Url, out var modId) ? entityFactory.GetOrCreateNexusModsMod(modId) : null,
+                IsInvolved = report.InvolvedModules.Any(y => y.ModuleId == x.Id),
+            }));
+        }
+
+        var linkedCrashReports = _linkedCrashReportsChannel.Reader.ReadAllAsync(ct)
+            .Where(x => !failedCrashReportFileIds.Contains(x.FileId));
+        var ignoredCrashReports = _ignoredCrashReportsChannel.Reader.ReadAllAsync(ct)
+            .Concat(ignoredCrashReportFileEntities.ToAsyncEnumerable())
+            .Concat(failedCrashReportFileIds.Select(x => new CrashReportIgnoredFileEntity
+            {
+                TenantId = tenant,
+                Value = x,
+            }).ToAsyncEnumerable());
+
+        await using var _ = await dbContextWrite.CreateSaveScopeAsync();
+        await dbContextWrite.CrashReports.UpsertOnSaveAsync(crashReportsBuilder);
+        await dbContextWrite.CrashReportModuleInfos.UpsertOnSaveAsync(crashReportModulesBuilder);
+        await dbContextWrite.CrashReportToMetadatas.UpsertOnSaveAsync(crashReportMetadatasBuilder);
+        await dbContextWrite.CrashReportToFileIds.UpsertOnSaveAsync(linkedCrashReports);
+        await dbContextWrite.CrashReportIgnoredFileIds.UpsertOnSaveAsync(ignoredCrashReports);
+        // Disposing the DBContext will save the data
+    }
+
+    public ValueTask DisposeAsync()
+    {
+        _lock.Dispose();
+        return ValueTask.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/ExternalStorageConstants.cs b/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/ExternalStorageConstants.cs
index 553e5153..89adb734 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/ExternalStorageConstants.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/ExternalStorageConstants.cs
@@ -1,10 +1,3 @@
 namespace BUTR.Site.NexusMods.Server.Services;
 
-public class ExternalStorageConstants
-{
-    public static readonly string Discord = "DiscordTokens";
-    public static readonly string Steam = "SteamTokens";
-    public static readonly string GOG = "GOGTokens";
-}
-
 public record ExternalDataHolder<TData>(string ExternalId, TData Data) where TData : class;
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/IDiscordStorage.cs b/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/IDiscordStorage.cs
index bdf98d0c..690bbbe6 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/IDiscordStorage.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/IDiscordStorage.cs
@@ -1,4 +1,5 @@
 using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 
 using Microsoft.EntityFrameworkCore;
@@ -39,13 +40,13 @@ public DatabaseDiscordStorage(IAppDbContextRead dbContextRead, IAppDbContextWrit
     public async Task<bool> UpsertAsync(NexusModsUserId nexusModsUserId, string discordUserId, DiscordOAuthTokens tokens)
     {
         var entityFactory = _dbContextWrite.GetEntityFactory();
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
 
         var nexusModsUserToIntegrationDiscord = entityFactory.GetOrCreateNexusModsUserDiscord(nexusModsUserId, discordUserId);
         var tokensDiscord = entityFactory.GetOrCreateIntegrationDiscordTokens(nexusModsUserId, discordUserId, tokens.AccessToken, tokens.RefreshToken, tokens.ExpiresAt);
 
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToDiscord, nexusModsUserToIntegrationDiscord);
-        _dbContextWrite.FutureUpsert(x => x.IntegrationDiscordTokens, tokensDiscord);
+        await _dbContextWrite.NexusModsUserToDiscord.UpsertOnSaveAsync(nexusModsUserToIntegrationDiscord);
+        await _dbContextWrite.IntegrationDiscordTokens.UpsertOnSaveAsync(tokensDiscord);
         return true;
     }
 
diff --git a/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/IGOGStorage.cs b/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/IGOGStorage.cs
index 49e7dbe2..077ea2fb 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/IGOGStorage.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/IGOGStorage.cs
@@ -1,4 +1,5 @@
 using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -46,7 +47,7 @@ public DatabaseGOGStorage(IAppDbContextRead dbContextRead, IAppDbContextWrite db
     public async Task<bool> CheckOwnedGamesAsync(NexusModsUserId nexusModsUserId, string gogUserId, GOGOAuthTokens tokens)
     {
         var entityFactory = _dbContextWrite.GetEntityFactory();
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
 
         var games = await _gogEmbedClient.GetGamesAsync(tokens.AccessToken, CancellationToken.None);
         if (games is null)
@@ -59,10 +60,10 @@ public async Task<bool> CheckOwnedGamesAsync(NexusModsUserId nexusModsUserId, st
         {
             GOGUserId = gogUserId,
             OwnedTenant = x,
-        }).ToList();
+        }).ToArray();
 
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToGOG, nexusModsUserToIntegrationGOG);
-        _dbContextWrite.FutureUpsert(x => x.IntegrationGOGToOwnedTenants, list);
+        await _dbContextWrite.NexusModsUserToGOG.UpsertOnSaveAsync(nexusModsUserToIntegrationGOG);
+        await _dbContextWrite.IntegrationGOGToOwnedTenants.UpsertOnSaveAsync(list);
         await _dbContextWrite.IntegrationGOGToOwnedTenants.Where(x => x.GOGUserId == gogUserId).ExecuteDeleteAsync(CancellationToken.None);
         return true;
     }
@@ -77,13 +78,13 @@ public async Task<bool> CheckOwnedGamesAsync(NexusModsUserId nexusModsUserId, st
     public async Task<bool> UpsertAsync(NexusModsUserId nexusModsUserId, string gogUserId, GOGOAuthTokens tokens)
     {
         var entityFactory = _dbContextWrite.GetEntityFactory();
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
 
         var nexusModsUserToIntegrationGOG = entityFactory.GetOrCreateNexusModsUserGOG(nexusModsUserId, gogUserId);
         var tokensGOG = entityFactory.GetOrCreateIntegrationGOGTokens(nexusModsUserId, gogUserId, tokens.AccessToken, tokens.RefreshToken, tokens.ExpiresAt);
 
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToGOG, nexusModsUserToIntegrationGOG);
-        _dbContextWrite.FutureUpsert(x => x.IntegrationGOGTokens, tokensGOG);
+        await _dbContextWrite.NexusModsUserToGOG.UpsertOnSaveAsync(nexusModsUserToIntegrationGOG);
+        await _dbContextWrite.IntegrationGOGTokens.UpsertOnSaveAsync(tokensGOG);
         return true;
     }
 
diff --git a/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/ISteamStorage.cs b/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/ISteamStorage.cs
index 8c2b2aef..0bf157a9 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/ISteamStorage.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/ExternalStorage/ISteamStorage.cs
@@ -1,10 +1,12 @@
 using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
 
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -43,11 +45,11 @@ public DatabaseSteamStorage(IAppDbContextRead dbContextRead, IAppDbContextWrite
     public async Task<bool> CheckOwnedGamesAsync(NexusModsUserId nexusModsUserId, string steamUserId)
     {
         var entityFactory = _dbContextWrite.GetEntityFactory();
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
 
         var nexusModsUserToIntegrationSteam = entityFactory.GetOrCreateNexusModsUserSteam(nexusModsUserId, steamUserId);
 
-        var list = new List<IntegrationSteamToOwnedTenantEntity>();
+        var list = ImmutableArray.CreateBuilder<IntegrationSteamToOwnedTenantEntity>();
         foreach (var (tenant, gameIds) in TenantToGameIds)
         {
             var ownsTenant = false;
@@ -67,8 +69,8 @@ public async Task<bool> CheckOwnedGamesAsync(NexusModsUserId nexusModsUserId, st
             }
         }
 
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToSteam, nexusModsUserToIntegrationSteam);
-        _dbContextWrite.FutureUpsert(x => x.IntegrationSteamToOwnedTenants, list);
+        await _dbContextWrite.NexusModsUserToSteam.UpsertOnSaveAsync(nexusModsUserToIntegrationSteam);
+        await _dbContextWrite.IntegrationSteamToOwnedTenants.UpsertOnSaveAsync(list.ToArray());
         await _dbContextWrite.IntegrationSteamToOwnedTenants.Where(x => x.SteamUserId == steamUserId).ExecuteDeleteAsync(CancellationToken.None);
         return true;
     }
@@ -83,13 +85,13 @@ public async Task<bool> CheckOwnedGamesAsync(NexusModsUserId nexusModsUserId, st
     public async Task<bool> UpsertAsync(NexusModsUserId nexusModsUserId, string steamUserId, Dictionary<string, string> data)
     {
         var entityFactory = _dbContextWrite.GetEntityFactory();
-        await using var _ = _dbContextWrite.CreateSaveScope();
+        await using var _ = await _dbContextWrite.CreateSaveScopeAsync();
 
         var nexusModsUserToIntegrationSteam = entityFactory.GetOrCreateNexusModsUserSteam(nexusModsUserId, steamUserId);
         var tokensSteam = entityFactory.GetOrCreateIntegrationSteamTokens(nexusModsUserId, steamUserId, data);
 
-        _dbContextWrite.FutureUpsert(x => x.NexusModsUserToSteam, nexusModsUserToIntegrationSteam);
-        _dbContextWrite.FutureUpsert(x => x.IntegrationSteamTokens, tokensSteam);
+        await _dbContextWrite.NexusModsUserToSteam.UpsertOnSaveAsync(nexusModsUserToIntegrationSteam);
+        await _dbContextWrite.IntegrationSteamTokens.UpsertOnSaveAsync(tokensSteam);
         return true;
     }
 
diff --git a/src/BUTR.Site.NexusMods.Server/Services/HttpClients/GOGEmbedClient.cs b/src/BUTR.Site.NexusMods.Server/Services/HttpClients/GOGEmbedClient.cs
index d8d537f3..99cae021 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/HttpClients/GOGEmbedClient.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/HttpClients/GOGEmbedClient.cs
@@ -1,6 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
-
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 
 using System;
 using System.Collections.Generic;
@@ -13,6 +11,10 @@
 
 namespace BUTR.Site.NexusMods.Server.Services;
 
+public sealed record GOGUserInfo(
+    [property: JsonPropertyName("id")] string Id,
+    [property: JsonPropertyName("username")] string Username);
+
 public sealed class GOGEmbedClient
 {
     public record UserInfo(
diff --git a/src/BUTR.Site.NexusMods.Server/Services/HttpClients/SteamAPIClient.cs b/src/BUTR.Site.NexusMods.Server/Services/HttpClients/SteamAPIClient.cs
index 0652ac36..06c5efa1 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/HttpClients/SteamAPIClient.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/HttpClients/SteamAPIClient.cs
@@ -1,5 +1,4 @@
-using BUTR.Site.NexusMods.Server.Models;
-using BUTR.Site.NexusMods.Server.Options;
+using BUTR.Site.NexusMods.Server.Options;
 
 using Microsoft.Extensions.Options;
 
@@ -13,6 +12,10 @@
 
 namespace BUTR.Site.NexusMods.Server.Services;
 
+public sealed record SteamUserInfo(
+    [property: JsonPropertyName("id")] string Id,
+    [property: JsonPropertyName("username")] string Username);
+
 public sealed class SteamAPIClient
 {
     public record GetUserInfoRoot(
diff --git a/src/BUTR.Site.NexusMods.Server/Services/NexusModsModFileParser.cs b/src/BUTR.Site.NexusMods.Server/Services/NexusModsModFileParser.cs
index 00872f03..a535cd99 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/NexusModsModFileParser.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/NexusModsModFileParser.cs
@@ -3,7 +3,7 @@
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.NexusModsAPI;
-using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.Http;
 
 using SharpCompress.Archives;
 using SharpCompress.Common;
@@ -23,6 +23,13 @@
 
 namespace BUTR.Site.NexusMods.Server.Services;
 
+public sealed record NexusModsModFileParserResult
+{
+    public required ModuleInfoExtended ModuleInfo { get; init; }
+    public required NexusModsFileId FileId { get; init; }
+    public required DateTimeOffset Uploaded { get; init; }
+}
+
 public class NexusModsModFileParser
 {
     private readonly HttpClient _httpClient;
@@ -47,7 +54,7 @@ public async IAsyncEnumerable<NexusModsModFileParserResult> GetModuleInfosAsync(
 
             if (await SubModuleXmlCountAsync(fileInfo) is var subModuleCount && false || subModuleCount == 0) continue;
 
-            var uploadedTimestamp = DateTimeOffset.FromUnixTimeSeconds(uploadedTimestampRaw).UtcDateTime;
+            var uploadedTimestamp = DateTimeOffset.FromUnixTimeSeconds(uploadedTimestampRaw).ToUniversalTime();
             var downloadLinks = await _apiClient.GetModFileLinksAsync(gameDomain, modId, fileId, apiKey, ct) ?? Array.Empty<NexusModsDownloadLinkResponse>();
             if (downloadLinks.Length == 0) continue;
 
diff --git a/src/BUTR.Site.NexusMods.Server/Services/QuartzEventProviderService.cs b/src/BUTR.Site.NexusMods.Server/Services/QuartzEventProviderService.cs
index e9aa4aab..a48923c9 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/QuartzEventProviderService.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/QuartzEventProviderService.cs
@@ -8,210 +8,51 @@
 
 namespace BUTR.Site.NexusMods.Server.Services;
 
-public class QuartzEventProviderService : IJobListener, ITriggerListener, ISchedulerListener
+public class QuartzEventProviderService : IJobListener, ITriggerListener
 {
-    public event EventHandler<EventArgs<IJobDetail>>? OnJobAdded;
-    public event EventHandler<EventArgs<JobKey>>? OnJobDeleted;
-    public event EventHandler<EventArgs<IJobExecutionContext>>? OnJobExecutionVetoed;
-    public event EventHandler<EventArgs<JobKey>>? OnJobInterrupted;
-    public event EventHandler<EventArgs<JobKey>>? OnJobPaused;
-    public event EventHandler<EventArgs<JobKey>>? OnJobResumed;
-    public event EventHandler<EventArgs<ITrigger>>? OnJobScheduled;
-    public event EventHandler<EventArgs<string>>? OnJobsPaused;
-    public event EventHandler<EventArgs<string>>? OnJobsResumed;
-    public event EventHandler<EventArgs<IJobExecutionContext>>? OnJobToBeExecuted;
-    public event EventHandler<EventArgs<TriggerKey>>? OnJobUnscheduled;
+    public event EventHandler<QuartzEventArgs<IJobExecutionContext>>? OnJobToBeExecuted;
+    public event EventHandler<QuartzEventArgs<IJobExecutionContext>>? OnJobExecutionVetoed;
     public event EventHandler<JobWasExecutedEventArgs>? OnJobWasExecuted;
-    public event EventHandler<SchedulerErrorEventArgs>? OnSchedulerError;
-    public event EventHandler<CancellationToken>? OnSchedulerInStandbyMode;
-    public event EventHandler<CancellationToken>? OnSchedulerShutdown;
-    public event EventHandler<CancellationToken>? OnSchedulerShuttingdown;
-    public event EventHandler<CancellationToken>? OnSchedulerStarted;
-    public event EventHandler<CancellationToken>? OnSchedulerStarting;
-    public event EventHandler<CancellationToken>? OnSchedulingDataCleared;
-    public event EventHandler<EventArgs<ITrigger>>? OnTriggerFinalized;
-    public event EventHandler<EventArgs<ITrigger>>? OnTriggerMisfired;
-    public event EventHandler<EventArgs<TriggerKey>>? OnTriggerPaused;
-    public event EventHandler<EventArgs<TriggerKey>>? OnTriggerResumed;
-    public event EventHandler<EventArgs<string?>>? OnTriggerGroupPaused;
-    public event EventHandler<EventArgs<string?>>? OnTriggerGroupResumed;
-    public event EventHandler<TriggerEventArgs>? OnTriggerComplete;
+	public event EventHandler<TriggerEventArgs>? OnTriggerComplete;
     public event EventHandler<TriggerEventArgs>? OnTriggerFired;
 
     public string Name => nameof(QuartzEventProviderService);
 
-    public Task JobAdded(IJobDetail jobDetail, CancellationToken cancellationToken = default)
+    public Task JobToBeExecuted(IJobExecutionContext context, CancellationToken ct)
     {
-        OnJobAdded?.Invoke(this, new EventArgs<IJobDetail>(jobDetail, cancellationToken));
+        OnJobToBeExecuted?.Invoke(this, new(context, ct));
         return Task.CompletedTask;
     }
-
-    public Task JobDeleted(JobKey jobKey, CancellationToken cancellationToken = default)
-    {
-        OnJobDeleted?.Invoke(this, new EventArgs<JobKey>(jobKey, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobExecutionVetoed(IJobExecutionContext context, CancellationToken cancellationToken = default)
-    {
-        OnJobExecutionVetoed?.Invoke(this, new EventArgs<IJobExecutionContext>(context, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobInterrupted(JobKey jobKey, CancellationToken cancellationToken = default)
-    {
-        OnJobInterrupted?.Invoke(this, new EventArgs<JobKey>(jobKey, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobPaused(JobKey jobKey, CancellationToken cancellationToken = default)
-    {
-        OnJobPaused?.Invoke(this, new EventArgs<JobKey>(jobKey, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobResumed(JobKey jobKey, CancellationToken cancellationToken = default)
-    {
-        OnJobResumed?.Invoke(this, new EventArgs<JobKey>(jobKey, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobScheduled(ITrigger trigger, CancellationToken cancellationToken = default)
+    public Task JobExecutionVetoed(IJobExecutionContext context, CancellationToken ct)
     {
-        OnJobScheduled?.Invoke(this, new EventArgs<ITrigger>(trigger, cancellationToken));
+        OnJobExecutionVetoed?.Invoke(this, new(context, ct));
         return Task.CompletedTask;
     }
-
-    public Task JobsPaused(string jobGroup, CancellationToken cancellationToken = default)
+    public Task JobWasExecuted(IJobExecutionContext context, JobExecutionException? jobException, CancellationToken ct)
     {
-        OnJobsPaused?.Invoke(this, new EventArgs<string>(jobGroup, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobsResumed(string jobGroup, CancellationToken cancellationToken = default)
-    {
-        OnJobsResumed?.Invoke(this, new EventArgs<string>(jobGroup, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobToBeExecuted(IJobExecutionContext context, CancellationToken cancellationToken = default)
-    {
-        OnJobToBeExecuted?.Invoke(this, new EventArgs<IJobExecutionContext>(context, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobUnscheduled(TriggerKey triggerKey, CancellationToken cancellationToken = default)
-    {
-        OnJobUnscheduled?.Invoke(this, new EventArgs<TriggerKey>(triggerKey, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task JobWasExecuted(IJobExecutionContext context, JobExecutionException? jobException, CancellationToken cancellationToken = default)
-    {
-        OnJobWasExecuted?.Invoke(this, new JobWasExecutedEventArgs(context, jobException, cancellationToken)
+        OnJobWasExecuted?.Invoke(this, new(context, jobException, ct)
         {
             JobException = jobException
         });
         return Task.CompletedTask;
     }
 
-    public Task SchedulerError(string msg, SchedulerException cause, CancellationToken cancellationToken = default)
-    {
-        OnSchedulerError?.Invoke(this, new SchedulerErrorEventArgs
-        {
-            ErrorMessage = msg,
-            Exception = cause,
-            CancelToken = cancellationToken
-        });
-        return Task.CompletedTask;
-    }
 
-    public Task SchedulerInStandbyMode(CancellationToken cancellationToken = default)
+    public Task TriggerFired(ITrigger trigger, IJobExecutionContext context, CancellationToken ct)
     {
-        OnSchedulerInStandbyMode?.Invoke(this, cancellationToken);
+        OnTriggerFired?.Invoke(this, new(trigger, context, ct));
         return Task.CompletedTask;
     }
-
-    public Task SchedulerShutdown(CancellationToken cancellationToken = default)
+    public Task TriggerComplete(ITrigger trigger, IJobExecutionContext context, SchedulerInstruction triggerInstructionCode, CancellationToken ct)
     {
-        OnSchedulerShutdown?.Invoke(this, cancellationToken);
+        OnTriggerComplete?.Invoke(this, new(trigger, context, ct));
         return Task.CompletedTask;
     }
 
-    public Task SchedulerShuttingdown(CancellationToken cancellationToken = default)
-    {
-        OnSchedulerShuttingdown?.Invoke(this, cancellationToken);
-        return Task.CompletedTask;
-    }
-
-    public Task SchedulerStarted(CancellationToken cancellationToken = default)
-    {
-        OnSchedulerStarted?.Invoke(this, cancellationToken);
-        return Task.CompletedTask;
-    }
-
-    public Task SchedulerStarting(CancellationToken cancellationToken = default)
-    {
-        OnSchedulerStarting?.Invoke(this, cancellationToken);
-        return Task.CompletedTask;
-    }
-
-    public Task SchedulingDataCleared(CancellationToken cancellationToken = default)
-    {
-        OnSchedulingDataCleared?.Invoke(this, cancellationToken);
-        return Task.CompletedTask;
-    }
-
-    public Task TriggerComplete(ITrigger trigger, IJobExecutionContext context, SchedulerInstruction triggerInstructionCode, CancellationToken cancellationToken = default)
-    {
-        OnTriggerComplete?.Invoke(this, new TriggerEventArgs(trigger, context, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task TriggerFinalized(ITrigger trigger, CancellationToken cancellationToken = default)
-    {
-        OnTriggerFinalized?.Invoke(this, new EventArgs<ITrigger>(trigger, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task TriggerFired(ITrigger trigger, IJobExecutionContext context, CancellationToken cancellationToken = default)
-    {
-        OnTriggerFired?.Invoke(this, new TriggerEventArgs(trigger, context, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task TriggerMisfired(ITrigger trigger, CancellationToken cancellationToken = default)
-    {
-        OnTriggerMisfired?.Invoke(this, new EventArgs<ITrigger>(trigger, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task TriggerPaused(TriggerKey triggerKey, CancellationToken cancellationToken = default)
-    {
-        OnTriggerPaused?.Invoke(this, new EventArgs<TriggerKey>(triggerKey, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task TriggerResumed(TriggerKey triggerKey, CancellationToken cancellationToken = default)
-    {
-        OnTriggerResumed?.Invoke(this, new EventArgs<TriggerKey>(triggerKey, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task TriggersPaused(string? triggerGroup, CancellationToken cancellationToken = default)
-    {
-        OnTriggerGroupPaused?.Invoke(this, new EventArgs<string?>(triggerGroup, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task TriggersResumed(string? triggerGroup, CancellationToken cancellationToken = default)
-    {
-        OnTriggerGroupResumed?.Invoke(this, new EventArgs<string?>(triggerGroup, cancellationToken));
-        return Task.CompletedTask;
-    }
-
-    public Task<bool> VetoJobExecution(ITrigger trigger, IJobExecutionContext context, CancellationToken cancellationToken = default)
+    public Task<bool> VetoJobExecution(ITrigger trigger, IJobExecutionContext context, CancellationToken ct)
     {
         return Task.FromResult(false);
     }
+
+    public Task TriggerMisfired(ITrigger trigger, CancellationToken ct) => Task.CompletedTask;
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Services/QuartzListenerBackgroundService.cs b/src/BUTR.Site.NexusMods.Server/Services/QuartzListenerBackgroundService.cs
index 92b9dd5b..fba693ea 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/QuartzListenerBackgroundService.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/QuartzListenerBackgroundService.cs
@@ -3,6 +3,7 @@
 using BUTR.Site.NexusMods.Server.Models.Database;
 using BUTR.Site.NexusMods.Server.Models.Quartz;
 
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -27,28 +28,18 @@ internal sealed class QuartzListenerBackgroundService : BackgroundService
     private readonly ILogger _logger;
     private readonly IServiceProvider _serviceProvider;
     private readonly QuartzEventProviderService _quartzEventProviderService;
-    private readonly ISchedulerFactory _schedulerFactory;
     private readonly Channel<Func<IAppDbContextWrite, CancellationToken, ValueTask>> _taskQueue;
 
-    public QuartzListenerBackgroundService(ILogger<QuartzListenerBackgroundService> logger, IServiceProvider serviceProvider, QuartzEventProviderService quartzEventProviderService, ISchedulerFactory schedulerFactory)
+    public QuartzListenerBackgroundService(ILogger<QuartzListenerBackgroundService> logger, IServiceProvider serviceProvider, QuartzEventProviderService quartzEventProviderService)
     {
         _logger = logger;
         _serviceProvider = serviceProvider;
         _quartzEventProviderService = quartzEventProviderService;
-        _schedulerFactory = schedulerFactory;
         _taskQueue = Channel.CreateUnbounded<Func<IAppDbContextWrite, CancellationToken, ValueTask>>(new UnboundedChannelOptions { SingleReader = true });
 
         _quartzEventProviderService.OnJobToBeExecuted += OnJobToBeExecuted;
         _quartzEventProviderService.OnJobWasExecuted += OnJobWasExecuted;
         _quartzEventProviderService.OnJobExecutionVetoed += OnJobExecutionVetoed;
-        _quartzEventProviderService.OnJobDeleted += OnJobDeleted;
-        _quartzEventProviderService.OnJobInterrupted += OnJobInterrupted;
-        _quartzEventProviderService.OnSchedulerError += OnSchedulerError;
-        _quartzEventProviderService.OnTriggerMisfired += OnTriggerMisfired;
-        _quartzEventProviderService.OnTriggerPaused += OnTriggerPaused;
-        _quartzEventProviderService.OnTriggerResumed += OnTriggerResumed;
-        _quartzEventProviderService.OnTriggerFinalized += OnTriggerFinalized;
-        _quartzEventProviderService.OnJobScheduled += OnJobScheduled;
     }
 
     public override void Dispose()
@@ -56,180 +47,46 @@ public override void Dispose()
         _quartzEventProviderService.OnJobToBeExecuted -= OnJobToBeExecuted;
         _quartzEventProviderService.OnJobWasExecuted -= OnJobWasExecuted;
         _quartzEventProviderService.OnJobExecutionVetoed -= OnJobExecutionVetoed;
-        _quartzEventProviderService.OnJobDeleted -= OnJobDeleted;
-        _quartzEventProviderService.OnJobInterrupted -= OnJobInterrupted;
-        _quartzEventProviderService.OnSchedulerError -= OnSchedulerError;
-        _quartzEventProviderService.OnTriggerMisfired -= OnTriggerMisfired;
-        _quartzEventProviderService.OnTriggerPaused -= OnTriggerPaused;
-        _quartzEventProviderService.OnTriggerResumed -= OnTriggerResumed;
-        _quartzEventProviderService.OnTriggerFinalized -= OnTriggerFinalized;
-        _quartzEventProviderService.OnJobScheduled -= OnJobScheduled;
 
         base.Dispose();
     }
 
-    private void OnJobScheduled(object? sender, EventArgs<ITrigger> e)
-    {
-        var jKey = e.Args.JobKey;
-        var tKey = e.Args.Key;
-        var log = new QuartzExecutionLogEntity
-        {
-            JobName = jKey.Name,
-            JobGroup = jKey.Group,
-            TriggerName = tKey.Name,
-            TriggerGroup = tKey.Group,
-            LogType = QuartzLogType.Trigger,
-            Result = "Job scheduled"
-        };
-        QueueInsertTask(log);
-    }
-
-    private void OnTriggerFinalized(object? sender, EventArgs<ITrigger> e)
-    {
-        var jKey = e.Args.JobKey;
-        var tKey = e.Args.Key;
-        var log = new QuartzExecutionLogEntity
-        {
-            JobName = jKey.Name,
-            JobGroup = jKey.Group,
-            TriggerName = tKey.Name,
-            TriggerGroup = tKey.Group,
-            LogType = QuartzLogType.Trigger,
-            Result = "Trigger ended"
-        };
-        QueueInsertTask(log);
-    }
-
-    private void OnTriggerResumed(object? sender, EventArgs<TriggerKey> e)
-    {
-        var tKey = e.Args;
-        var log = new QuartzExecutionLogEntity
-        {
-            TriggerName = tKey.Name,
-            TriggerGroup = tKey.Group,
-            LogType = QuartzLogType.Trigger,
-            Result = "Trigger resumed"
-        };
-        QueueGetJobKeyAndInsertTask(log);
-    }
-
-    private void OnTriggerPaused(object? sender, EventArgs<TriggerKey> e)
-    {
-        var tKey = e.Args;
-        var log = new QuartzExecutionLogEntity
-        {
-            TriggerName = tKey.Name,
-            TriggerGroup = tKey.Group,
-            LogType = QuartzLogType.Trigger,
-            Result = "Trigger paused"
-        };
-        QueueGetJobKeyAndInsertTask(log);
-    }
-
-    private void OnTriggerMisfired(object? sender, EventArgs<ITrigger> e)
-    {
-        var jKey = e.Args.JobKey;
-        var tKey = e.Args.Key;
-        var log = new QuartzExecutionLogEntity
-        {
-            LogType = QuartzLogType.Trigger,
-            JobName = jKey.Name,
-            JobGroup = jKey.Group,
-            TriggerName = tKey.Name,
-            TriggerGroup = tKey.Group,
-            Result = "Trigger misfired"
-        };
-        QueueInsertTask(log);
-    }
-
-    private void OnSchedulerError(object? sender, SchedulerErrorEventArgs e)
-    {
-        var log = new QuartzExecutionLogEntity
-        {
-            LogType = QuartzLogType.System,
-            IsException = true,
-            ErrorMessage = e.ErrorMessage,
-            ExecutionLogDetail = new()
-            {
-                ErrorStackTrace = NonNullStackTrace(e.Exception)
-            }
-        };
-        QueueInsertTask(log);
-    }
-
-    private void OnJobInterrupted(object? sender, EventArgs<JobKey> e)
-    {
-        var jKey = e.Args;
-        var log = new QuartzExecutionLogEntity
-        {
-            JobName = jKey.Name,
-            JobGroup = jKey.Group,
-            LogType = QuartzLogType.System,
-            Result = "Job interrupted"
-        };
-        QueueInsertTask(log);
-    }
-
-    private void OnJobDeleted(object? sender, EventArgs<JobKey> e)
-    {
-        var jKey = e.Args;
-        var log = new QuartzExecutionLogEntity
-        {
-            JobName = jKey.Name,
-            JobGroup = jKey.Group,
-            LogType = QuartzLogType.System,
-            Result = "Job deleted"
-        };
-        QueueInsertTask(log);
-    }
-
-    private void OnJobExecutionVetoed(object? sender, EventArgs<IJobExecutionContext> e)
-    {
-        var log = CreateScheduleJobLogEntry(e.Args, defaultIsSuccess: false);
-        log.IsVetoed = true;
-        QueueUpdateTask(log);
-    }
+    private void OnJobToBeExecuted(object? sender, QuartzEventArgs<IJobExecutionContext> e) =>
+        QueueInsertTask(CreateScheduleJobLogEntry(e.Args));
 
-    private void OnJobWasExecuted(object? sender, JobWasExecutedEventArgs e)
-    {
+    private void OnJobWasExecuted(object? sender, JobWasExecutedEventArgs e) =>
         QueueUpdateTask(CreateScheduleJobLogEntry(e.JobExecutionContext, e.JobException, true));
-    }
 
-    private void OnJobToBeExecuted(object? sender, EventArgs<IJobExecutionContext> e)
-    {
-        QueueInsertTask(CreateScheduleJobLogEntry(e.Args));
-    }
+    private void OnJobExecutionVetoed(object? sender, QuartzEventArgs<IJobExecutionContext> e) =>
+        QueueUpdateTask(CreateScheduleJobLogEntry(e.Args, defaultIsSuccess: false) with
+        {
+            IsVetoed = true
+        });
 
-    public override async Task StartAsync(CancellationToken cancellationToken)
-    {
-        await base.StartAsync(cancellationToken);
-    }
 
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    protected override async Task ExecuteAsync(CancellationToken ct)
     {
-        await MarkIncompleteExecutionAsync(stoppingToken);
+        await MarkIncompleteExecutionAsync(ct);
 
-        while (!stoppingToken.IsCancellationRequested)
+        while (!ct.IsCancellationRequested)
         {
-            await ProcessTaskAsync(stoppingToken);
+            await ProcessTaskAsync(ct);
         }
     }
 
-    internal async Task MarkIncompleteExecutionAsync(CancellationToken stoppingToken)
+    private async Task MarkIncompleteExecutionAsync(CancellationToken ct)
     {
         try
         {
             await using var scope = _serviceProvider.CreateAsyncScope();
             var dbContext = scope.ServiceProvider.GetRequiredService<IAppDbContextWrite>();
 
-            var isSuccessNullJobs = dbContext.QuartzExecutionLogs.Where(x => !x.IsSuccess.HasValue && x.LogType == QuartzLogType.ScheduleJob);
-            foreach (var log in isSuccessNullJobs)
-            {
-                log.IsSuccess = false;
-                log.ErrorMessage = "Incomplete execution.";
-                log.JobRunTime = null;
-            }
-            await dbContext.SaveAsync(CancellationToken.None);
+            await dbContext.QuartzExecutionLogs
+                .Where(x => !x.IsSuccess.HasValue)
+                .ExecuteUpdateAsync(calls => calls
+                    .SetProperty(x => x.IsSuccess, false)
+                    .SetProperty(x => x.ErrorMessage, "Incomplete execution.")
+                    .SetProperty(x => x.JobRunTime, TimeSpan.Zero), CancellationToken.None);
         }
         catch (OperationCanceledException)
         {
@@ -241,29 +98,21 @@ internal async Task MarkIncompleteExecutionAsync(CancellationToken stoppingToken
         }
     }
 
-    internal async Task ProcessTaskAsync(CancellationToken stoppingToken = default)
+    private async Task ProcessTaskAsync(CancellationToken ct = default)
     {
-        var batch = await GetBatchAsync(stoppingToken);
+        var batch = await GetBatchAsync(ct);
 
         _logger.LogInformation("Got a batch with {TaskCount} task(s). Saving to data store", batch.Count);
 
+        await using var scope = _serviceProvider.CreateAsyncScope();
+        var dbContext = scope.ServiceProvider.GetRequiredService<IAppDbContextWrite>();
         try
         {
-            await using var scope = _serviceProvider.CreateAsyncScope();
-            var dbContext = scope.ServiceProvider.GetRequiredService<IAppDbContextWrite>();
+            await using var _ = await dbContext.CreateSaveScopeAsync();
 
             foreach (var workItem in batch)
             {
-                await workItem(dbContext, stoppingToken);
-            }
-
-            try
-            {
-                await dbContext.SaveAsync(CancellationToken.None);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error occurred while saving execution logs");
+                await workItem(dbContext, ct);
             }
         }
         catch (OperationCanceledException)
@@ -276,62 +125,18 @@ internal async Task ProcessTaskAsync(CancellationToken stoppingToken = default)
         }
     }
 
-
-    private QuartzExecutionLogEntity CreateScheduleJobLogEntry(IJobExecutionContext context, JobExecutionException? jobException = null, bool? defaultIsSuccess = null)
+    private void QueueTask(Func<IAppDbContextWrite, CancellationToken, ValueTask> task)
     {
-        var log = new QuartzExecutionLogEntity
-        {
-            RunInstanceId = context.FireInstanceId,
-            JobGroup = context.JobDetail.Key.Group,
-            JobName = context.JobDetail.Key.Name,
-            TriggerName = context.Trigger.Key.Name,
-            TriggerGroup = context.Trigger.Key.Group,
-            FireTimeUtc = context.FireTimeUtc,
-            ScheduleFireTimeUtc = context.ScheduledFireTimeUtc,
-            RetryCount = context.RefireCount,
-            JobRunTime = context.JobRunTime,
-            LogType = QuartzLogType.ScheduleJob
-        };
-        var logDetail = new QuartzExecutionLogDetailEntity();
-
-        log.ReturnCode = context.GetReturnCode();
-        log.IsSuccess = context.GetIsSuccess() ?? defaultIsSuccess;
-
-        var execDetail = context.GetExecutionDetails();
-        if (!string.IsNullOrEmpty(execDetail))
-        {
-            logDetail.ExecutionDetails = execDetail;
-            log.ExecutionLogDetail = logDetail;
-        }
-
-        if (jobException != null)
-        {
-            log.ErrorMessage = jobException.Message;
-            log.ExecutionLogDetail = logDetail;
-            logDetail.ErrorCode = jobException.HResult;
-            logDetail.ErrorStackTrace = jobException.ToString();
-            logDetail.ErrorHelpLink = jobException.HelpLink;
-
-            log.ReturnCode ??= jobException.HResult.ToString();
-
-            log.IsException = true;
-            log.IsSuccess = false;
-        }
-        else
+        if (!_taskQueue.Writer.TryWrite(task))
         {
-            if (context.Result != null)
-            {
-                var result = Convert.ToString(context.Result, CultureInfo.InvariantCulture);
-                log.Result = result?.Substring(0, Math.Min(result.Length, RESULT_MAX_LENGTH));
-            }
+            // Should not happen since it's unbounded Channel. It 'should' only fail if we call writer.Complete()
+            throw new InvalidOperationException("Failed to write the log message");
         }
-
-        return log;
     }
 
-    private async Task<List<Func<IAppDbContextWrite, CancellationToken, ValueTask>>> GetBatchAsync(CancellationToken cancellationToken)
+    private async Task<List<Func<IAppDbContextWrite, CancellationToken, ValueTask>>> GetBatchAsync(CancellationToken ct)
     {
-        await _taskQueue.Reader.WaitToReadAsync(cancellationToken);
+        await _taskQueue.Reader.WaitToReadAsync(ct);
 
         var batch = new List<Func<IAppDbContextWrite, CancellationToken, ValueTask>>();
 
@@ -343,118 +148,73 @@ private async Task<List<Func<IAppDbContextWrite, CancellationToken, ValueTask>>>
         return batch;
     }
 
-    private void QueueUpdateTask(QuartzExecutionLogEntity log)
+    private void QueueUpdateTask(QuartzExecutionLogEntity log) => QueueTask(async (dbContext, ct) =>
     {
-        QueueTask(async (dbContext, ct) =>
+        try
         {
-            try
-            {
-                await dbContext.QuartzExecutionLogs.SingleMergeAsync(log, o => { o.ColumnPrimaryKeyExpression = e => e.RunInstanceId; }, CancellationToken.None);
-            }
-            catch (Exception ex)
-            {
-                if (log.LogType == QuartzLogType.ScheduleJob)
-                {
-                    _logger.LogError(ex,
-                        "Error occurred while updating execution log with job key [{JobGroup}.{JobName}] run instance id [{RunInstanceId}]",
-                        log.JobGroup, log.JobName, log.RunInstanceId);
-                }
-                else
-                {
-                    _logger.LogError(ex,
-                        "Error occurred while updating {LogType} execution log with job key [{JobGroup}.{JobName}] trigger key [{TriggerGroup}.{TriggerName}]",
-                        log.LogType, log.JobGroup, log.JobName, log.TriggerGroup, log.TriggerName);
-                }
-            }
-        });
-    }
-
-    private void QueueGetJobKeyAndInsertTask(QuartzExecutionLogEntity log)
-    {
-        QueueTask(async (dbContext, ct) =>
+            await Task.Yield();
+            dbContext.QuartzExecutionLogs.Update(log);
+        }
+        catch (Exception ex)
         {
-            try
-            {
-                if (log.JobName == null && log is { TriggerName: not null, TriggerGroup: not null})
-                {
-                    // when there is no job name but has trigger name
-                    // try to determine the job name
-                    var scheduler = await _schedulerFactory.GetScheduler(ct);
-                    var trigger = await scheduler.GetTrigger(new TriggerKey(log.TriggerName, log.TriggerGroup), ct);
-                    if (trigger != null)
-                    {
-                        log.JobName = trigger.JobKey.Name;
-                        log.JobGroup = trigger.JobKey.Group;
-                    }
-                }
-
-                await dbContext.QuartzExecutionLogs.AddAsync(log, CancellationToken.None);
-            }
-            catch (Exception ex)
-            {
-                if (log.LogType == QuartzLogType.ScheduleJob)
-                {
-                    _logger.LogError(ex, "Error occurred while adding execution log with job key [{JobGroup}.{JobName}] run instance id [{RunInstanceId}]",
-                        log.JobGroup, log.JobName, log.RunInstanceId);
-                }
-                else
-                {
-                    _logger.LogError(ex, "Error occurred while adding {LogType} execution log with job key [{JobGroup}.{JobName}] trigger key [{TriggerGroup}.{TriggerName}]",
-                        log.LogType, log.JobGroup, log.JobName, log.TriggerGroup, log.TriggerName);
-                }
-            }
-        });
-    }
-
+            _logger.LogError(ex, "Error occurred while updating execution log with job key [{JobGroup}.{JobName}] trigger key [{TriggerGroup}.{TriggerName}] run instance id [{RunInstanceId}]",
+                log.JobGroup, log.JobName, log.TriggerGroup, log.TriggerName, log.RunInstanceId);
+        }
+    });
 
-    private void QueueInsertTask(QuartzExecutionLogEntity log)
+    private void QueueInsertTask(QuartzExecutionLogEntity log) => QueueTask(async (dbContext, ct) =>
     {
-        QueueTask(async (dbContext, ct) =>
+        try
         {
-            try
-            {
-                await dbContext.QuartzExecutionLogs.AddAsync(log, CancellationToken.None);
-            }
-            catch (Exception ex)
-            {
-                if (log.LogType == QuartzLogType.ScheduleJob)
-                {
-                    _logger.LogError(ex, "Error occurred while adding execution log with job key [{JobGroup}.{JobName}] run instance id [{RunInstanceId}]",
-                        log.JobGroup, log.JobName, log.RunInstanceId);
-                }
-                else
-                {
-                    _logger.LogError(ex, "Error occurred while adding {LogType} execution log with job key [{JobGroup}.{JobName}] trigger key [{TriggerGroup}.{TriggerName}]",
-                        log.LogType, log.JobGroup, log.JobName, log.TriggerGroup, log.TriggerName);
-                }
-            }
-        });
-    }
-
-    private void QueueTask(Func<IAppDbContextWrite, CancellationToken, ValueTask> task)
-    {
-        if (!_taskQueue.Writer.TryWrite(task))
+            await Task.Yield();
+            dbContext.QuartzExecutionLogs.Add(log);
+        }
+        catch (Exception ex)
         {
-            // Should not happen since it's unbounded Channel. It 'should' only fail if we call writer.Complete()
-            throw new InvalidOperationException("Failed to write the log message");
+            _logger.LogError(ex, "Error occurred while adding execution log with job key [{JobGroup}.{JobName}] trigger key [{TriggerGroup}.{TriggerName}] run instance id [{RunInstanceId}]",
+                log.JobGroup, log.JobName, log.TriggerGroup, log.TriggerName, log.RunInstanceId);
         }
-    }
+    });
 
-    /// <summary>
-    /// Return closest non null stack trace of exception.
-    /// Loop until null InnerException to get stack trace.
-    /// </summary>
-    /// <param name="exception"></param>
-    /// <returns>null if inner exceptions does not have stack trace</returns>
-    private static string? NonNullStackTrace(Exception? exception)
+    private static QuartzExecutionLogEntity CreateScheduleJobLogEntry(IJobExecutionContext context, JobExecutionException? jobException = null, bool? defaultIsSuccess = null)
     {
-        var currentException = exception;
-        while (currentException?.StackTrace == null)
+        var result = context.Result != null ? Convert.ToString(context.Result, CultureInfo.InvariantCulture) : null;
+        var isSuccess = jobException == null ? context.GetIsSuccess() ?? defaultIsSuccess : false;
+
+        var logDetail = new QuartzExecutionLogDetailEntity
         {
-            currentException = currentException?.InnerException;
-            if (currentException == null)
-                break;
-        }
-        return currentException?.StackTrace;
+            ExecutionDetails = context.GetExecutionDetails(),
+
+            ErrorCode = jobException?.HResult,
+            ErrorStackTrace = jobException?.ToString(),
+            ErrorHelpLink = jobException?.HelpLink,
+        };
+
+        var log = new QuartzExecutionLogEntity
+        {
+            LogId = 0,
+            RunInstanceId = context.FireInstanceId,
+            JobName = context.JobDetail.Key.Name,
+            JobGroup = context.JobDetail.Key.Group,
+            TriggerName = context.Trigger.Key.Name,
+            TriggerGroup = context.Trigger.Key.Group,
+            FireTimeUtc = context.FireTimeUtc,
+            JobRunTime = context.JobRunTime,
+
+            ScheduleFireTimeUtc = context.ScheduledFireTimeUtc,
+
+            RetryCount = context.RefireCount,
+
+            IsSuccess = isSuccess,
+            IsException = jobException == null ? !isSuccess : true,
+            IsVetoed = null,
+
+            ErrorMessage = jobException?.GetBaseException().Message,
+            ExecutionLogDetail = logDetail,
+            Result = result?.Substring(0, Math.Min(result.Length, RESULT_MAX_LENGTH)),
+            ReturnCode = context.GetReturnCode() ?? jobException?.HResult.ToString(),
+        };
+
+        return log;
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Services/SteamDepotDownloader.cs b/src/BUTR.Site.NexusMods.Server/Services/SteamDepotDownloader.cs
index c3dee2fd..be58c64f 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/SteamDepotDownloader.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/SteamDepotDownloader.cs
@@ -21,8 +21,7 @@ public SteamDepotDownloader(IOptions<SteamDepotDownloaderOptions> options)
     public async Task DownloadAsync(string version, string path, CancellationToken ct)
     {
         var args = $"{_options.BinaryPath} -app {_options.AppId} -depot {string.Join(" ", _options.Depots)} -beta {version} -filelist {_options.Filelist} -username {_options.Username} -password {_options.Password} -dir {path}";
-        var processInfo = new ProcessStartInfo("dotnet", args);
-        var process = Process.Start(processInfo);
+        var process = Process.Start(new ProcessStartInfo("dotnet", args));
         if (process is null) return;
         await process.WaitForExitAsync(ct);
     }
diff --git a/src/BUTR.Site.NexusMods.Server/Startup.cs b/src/BUTR.Site.NexusMods.Server/Startup.cs
index 72b49085..2cbedf79 100644
--- a/src/BUTR.Site.NexusMods.Server/Startup.cs
+++ b/src/BUTR.Site.NexusMods.Server/Startup.cs
@@ -4,18 +4,27 @@
 using BUTR.Authentication.NexusMods.Extensions;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Contexts.Configs;
+using BUTR.Site.NexusMods.Server.Controllers;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Jobs;
+using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Options;
 using BUTR.Site.NexusMods.Server.Services;
 using BUTR.Site.NexusMods.Server.Utils;
+using BUTR.Site.NexusMods.Server.Utils.APIResponses;
+using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Server.Utils.Http.Logging;
 using BUTR.Site.NexusMods.Server.Utils.Http.StreamingJson;
+using BUTR.Site.NexusMods.Server.Utils.Vogen;
 
 using Community.Microsoft.Extensions.Caching.PostgreSql;
 
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -45,6 +54,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Unicode;
+using System.Threading.Tasks;
 
 namespace BUTR.Site.NexusMods.Server;
 
@@ -86,7 +96,7 @@ public Startup(IConfiguration configuration)
 
     public void ConfigureServices(IServiceCollection services)
     {
-        var userAgent = $"{(_assemblyName.Name ?? "ERROR")} v{(_assemblyName.Version?.ToString() ?? "ERROR")} (github.com/BUTR)";
+        var userAgent = $"{_assemblyName.Name ?? "ERROR"} v{_assemblyName.Version?.ToString() ?? "ERROR"} (github.com/BUTR)";
 
         var connectionStringSection = _configuration.GetSection(ConnectionStringsSectionName);
         var crashReporterSection = _configuration.GetSection(CrashReporterSectionName);
@@ -165,7 +175,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             opt.AddJobListener<QuartzEventProviderService>(sp => sp.GetRequiredService<QuartzEventProviderService>());
             opt.AddTriggerListener<QuartzEventProviderService>(sp => sp.GetRequiredService<QuartzEventProviderService>());
-            opt.AddSchedulerListener<QuartzEventProviderService>(sp => sp.GetRequiredService<QuartzEventProviderService>());
 
             string AtEveryFirstDayOfMonth(int hour = 0) => $"0 0 {hour} ? 1-12 * *";
             string AtEveryMonday(int hour = 0) => $"0 0 {hour} ? * MON *";
@@ -201,18 +210,18 @@ public void ConfigureServices(IServiceCollection services)
         services.AddMemoryCache();
 
         services.AddSingleton<ITenantContextAccessor, TenantContextAccessor>();
-
-        services.AddScoped<IEntityConfigurationFactory, EntityConfigurationFactory>();
+        
+        services.AddSingleton<IEntityConfigurationFactory, EntityConfigurationFactory>();
         var types = typeof(Startup).Assembly.GetTypes().Where(x => x is { IsAbstract: false, BaseType: { IsGenericType: true } }).ToList();
         foreach (var type in types.Where(x => x.BaseType!.GetGenericTypeDefinition() == typeof(BaseEntityConfigurationWithTenant<>)))
-            services.AddScoped(typeof(BaseEntityConfigurationWithTenant<>).MakeGenericType(type.BaseType!.GetGenericArguments()), type);
+            services.AddSingleton(typeof(BaseEntityConfigurationWithTenant<>).MakeGenericType(type.BaseType!.GetGenericArguments()), type);
         foreach (var type in types.Where(x => x.BaseType!.GetGenericTypeDefinition() == typeof(BaseEntityConfiguration<>)))
-            services.AddScoped(typeof(BaseEntityConfiguration<>).MakeGenericType(type.BaseType!.GetGenericArguments()), type);
+            services.AddSingleton(typeof(BaseEntityConfiguration<>).MakeGenericType(type.BaseType!.GetGenericArguments()), type);
 
         services.AddDbContext<BaseAppDbContext>(ServiceLifetime.Scoped);
-        services.AddDbContextFactory<AppDbContextRead>(lifetime: ServiceLifetime.Scoped);
-        services.AddDbContextFactory<AppDbContextWrite>(lifetime: ServiceLifetime.Scoped);
-        services.AddScoped<IAppDbContextFactory, AppDbContextFactory>();
+        services.AddDbContextFactory<AppDbContextRead>( lifetime: ServiceLifetime.Singleton);
+        services.AddDbContextFactory<AppDbContextWrite>(lifetime: ServiceLifetime.Singleton);
+        services.AddSingleton<IAppDbContextFactory, AppDbContextFactory>();
         services.AddScoped<IAppDbContextRead>(sp => sp.GetRequiredService<IAppDbContextFactory>().CreateRead());
         services.AddScoped<IAppDbContextWrite>(sp => sp.GetRequiredService<IAppDbContextFactory>().CreateWrite());
 
@@ -224,6 +233,7 @@ public void ConfigureServices(IServiceCollection services)
         services.AddScoped<IGOGStorage, DatabaseGOGStorage>();
 
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IHttpMessageHandlerBuilderFilter, SyncLoggingHttpMessageHandlerBuilderFilter>());
+        services.AddTransient<CrashReportBatchedHandler>();
         services.AddTransient<NexusModsModFileParser>();
         services.AddSingleton<DiffProvider>();
 
@@ -233,7 +243,31 @@ public void ConfigureServices(IServiceCollection services)
             options.EncryptionKey = opts?.EncryptionKey ?? string.Empty;
         });
 
-        services.AddControllers().AddJsonOptions(opt => Configure(opt.JsonSerializerOptions));
+        services.AddTransient(typeof(APIResponseActionResultExecutor<>));
+
+        services.AddTransient<IProblemDetailsWriter, APIResponseProblemDetailsWriter>();
+        services.AddProblemDetails();
+
+        services.AddControllers(opt => opt.ValueProviderFactories.Add(new ClaimsValueProviderFactory()))
+            .ConfigureApiBehaviorOptions(options =>
+            {
+                var oldFactory = options.InvalidModelStateResponseFactory;
+                options.InvalidModelStateResponseFactory = context2 =>
+                {
+                    if (context2.ActionDescriptor is ControllerActionDescriptor context)
+                    {
+                        if (APIResponseUtils.IsReturnTypeAPIResponse(context.MethodInfo))
+                        {
+                            var problemDetailsFactory = context2.HttpContext.RequestServices.GetRequiredService<ProblemDetailsFactory>();
+                            var problemDetails = problemDetailsFactory.CreateValidationProblemDetails(context2.HttpContext, context2.ModelState);
+                            return new ObjectResult(APIResponse.FromError<object>(problemDetails)) {StatusCode = problemDetails.Status,};
+                        }
+                    }
+
+                    return oldFactory(context2);
+                };
+            })
+            .AddJsonOptions(opt => Configure(opt.JsonSerializerOptions));
         services.AddHttpContextAccessor();
         services.AddRouting();
         services.AddResponseCompression(options =>
@@ -282,7 +316,9 @@ public void ConfigureServices(IServiceCollection services)
 
             opt.DescribeAllParametersInCamelCase();
             opt.SupportNonNullableReferenceTypes();
+            opt.OperationFilter<BindIgnoreFilter>();
             opt.OperationFilter<AuthResponsesOperationFilter>();
+            opt.OperationFilter<APIResponseOperationFilter>();
             opt.SchemaFilter<VogenSchemaFilter>();
 
             // Really .NET?
@@ -332,6 +368,10 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env)
             app.UseDeveloperExceptionPage();
             app.UseCors("Development");
         }
+        else
+        {
+            app.UseExceptionHandler();
+        }
 
         app.UseResponseCompression();
 
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResult.cs b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResult.cs
new file mode 100644
index 00000000..d2eabea7
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResult.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+
+namespace BUTR.Site.NexusMods.Server.Utils.APIResponses;
+
+public sealed record APIResponseActionResult<TValue>(TValue? Value, ProblemDetails? Error) : IConvertToActionResult
+{
+    public static implicit operator APIResponseActionResult<TValue?>(TValue? value) => FromResult(value);
+    public static implicit operator APIResponseActionResult<TValue?>(ProblemDetails error) => FromError(error);
+    public static implicit operator APIResponseActionResult<TValue?>(APIResponseActionResultModel<TValue?> result) => new(result.Value, result.Error);
+
+    public static APIResponseActionResult<TValue?> FromResult(TValue? data) => new(data, null);
+    public static APIResponseActionResult<TValue?> FromError(ProblemDetails error) => new(default, error);
+
+    public IActionResult Convert() => new APIResponseActionResultModel<TValue>(Value, Error);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResultExecutor.cs b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResultExecutor.cs
new file mode 100644
index 00000000..1d928a17
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResultExecutor.cs
@@ -0,0 +1,123 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
+
+using System;
+using System.Runtime.ExceptionServices;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Utils.APIResponses;
+
+internal abstract class APIResponseActionResultExecutor
+{
+    protected static readonly string DefaultContentType = new MediaTypeHeaderValue("application/json")
+    {
+        Encoding = Encoding.UTF8
+    }.ToString();
+}
+
+internal sealed partial class APIResponseActionResultExecutor<TValue> : APIResponseActionResultExecutor, IActionResultExecutor<APIResponseActionResultModel<TValue>>
+{
+    private readonly ILogger _logger;
+    private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+    public APIResponseActionResultExecutor(ILogger<APIResponseActionResultExecutor<TValue>> logger, IOptions<JsonSerializerOptions> jsonSerializerOptions)
+    {
+        _logger = logger;
+        _jsonSerializerOptions = jsonSerializerOptions.Value;
+    }
+
+    public async Task ExecuteAsync(ActionContext context, APIResponseActionResultModel<TValue> result)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(result);
+
+        var response = context.HttpContext.Response;
+
+        ResponseContentTypeHelper.ResolveContentTypeAndEncoding(
+            /*result.ContentType,*/
+            response.ContentType,
+            (DefaultContentType, Encoding.UTF8),
+            MediaType.GetEncoding,
+            out var resolvedContentType,
+            out var resolvedContentTypeEncoding);
+
+        response.ContentType = resolvedContentType;
+
+        if (result.Error?.Status != null)
+        {
+            response.StatusCode = result.Error.Status.Value;
+        }
+
+        Log.JsonResultExecuting(_logger, result);
+
+        var value = result;
+        var jsonSerializerOptions = _jsonSerializerOptions;
+
+        // Keep this code in sync with SystemTextJsonOutputFormatter
+        var responseStream = response.Body;
+        if (resolvedContentTypeEncoding.CodePage == Encoding.UTF8.CodePage)
+        {
+            try
+            {
+                await JsonSerializer.SerializeAsync(responseStream, value, jsonSerializerOptions, context.HttpContext.RequestAborted);
+                await responseStream.FlushAsync(context.HttpContext.RequestAborted);
+            }
+            catch (OperationCanceledException) when (context.HttpContext.RequestAborted.IsCancellationRequested) { }
+        }
+        else
+        {
+            // JsonSerializer only emits UTF8 encoded output, but we need to write the response in the encoding specified by
+            // selectedEncoding
+            var transcodingStream = Encoding.CreateTranscodingStream(response.Body, resolvedContentTypeEncoding, Encoding.UTF8, leaveOpen: true);
+
+            ExceptionDispatchInfo? exceptionDispatchInfo = null;
+            try
+            {
+                await JsonSerializer.SerializeAsync(transcodingStream, value, jsonSerializerOptions, context.HttpContext.RequestAborted);
+                await transcodingStream.FlushAsync(context.HttpContext.RequestAborted);
+            }
+            catch (OperationCanceledException) when (context.HttpContext.RequestAborted.IsCancellationRequested)
+            { }
+            catch (Exception ex)
+            {
+                // TranscodingStream may write to the inner stream as part of it's disposal.
+                // We do not want this exception "ex" to be eclipsed by any exception encountered during the write. We will stash it and
+                // explicitly rethrow it during the finally block.
+                exceptionDispatchInfo = ExceptionDispatchInfo.Capture(ex);
+            }
+            finally
+            {
+                try
+                {
+                    await transcodingStream.DisposeAsync();
+                }
+                catch when (exceptionDispatchInfo != null)
+                {
+                }
+
+                exceptionDispatchInfo?.Throw();
+            }
+        }
+    }
+
+    private static partial class Log
+    {
+        [LoggerMessage(1, LogLevel.Information, "Executing JsonResult, writing value of type '{Type}'.", EventName = "JsonResultExecuting", SkipEnabledCheck = true)]
+        private static partial void JsonResultExecuting(ILogger logger, string? type);
+
+        public static void JsonResultExecuting(ILogger logger, object? value)
+        {
+            if (logger.IsEnabled(LogLevel.Information))
+            {
+                var type = value == null ? "null" : value.GetType().FullName;
+                JsonResultExecuting(logger, type);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResultModel.cs b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResultModel.cs
new file mode 100644
index 00000000..41a3e513
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseActionResultModel.cs
@@ -0,0 +1,17 @@
+using BUTR.Site.NexusMods.Server.Models.API;
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Utils.APIResponses;
+
+public sealed record APIResponseActionResultModel<TValue>(TValue? Value, ProblemDetails? Error) : APIResponse<TValue>(Value, Error), IActionResult
+{
+    public Task ExecuteResultAsync(ActionContext context)
+    {
+        var executor = context.HttpContext.RequestServices.GetRequiredService<APIResponseActionResultExecutor<TValue>>();
+        return executor.ExecuteAsync(context, this);
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseOperationFilter.cs b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseOperationFilter.cs
new file mode 100644
index 00000000..cb58188b
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseOperationFilter.cs
@@ -0,0 +1,28 @@
+using Microsoft.OpenApi.Models;
+
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+namespace BUTR.Site.NexusMods.Server.Utils.APIResponses;
+
+public sealed class APIResponseOperationFilter : IOperationFilter
+{
+    public void Apply(OpenApiOperation operation, OperationFilterContext? context)
+    {
+        if (context == default || context.MethodInfo == default)
+            return;
+
+        if (!APIResponseUtils.IsReturnTypeAPIResponse(context.MethodInfo))
+            return;
+
+        if (!operation.Responses.TryGetValue("200", out var successResponse))
+            return;
+
+        var copy400 = CopyHelper.CopyPublicProperties(successResponse, new OpenApiResponse());
+        copy400.Description = "Invalid API Request.";
+        operation.Responses.Add("400", copy400);
+
+        var copy500 = CopyHelper.CopyPublicProperties(successResponse, new OpenApiResponse());
+        copy500.Description = "API Request Execution Error.";
+        operation.Responses.Add("500", copy500);
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseProblemDetailsWriter.cs b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseProblemDetailsWriter.cs
new file mode 100644
index 00000000..21318fb0
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseProblemDetailsWriter.cs
@@ -0,0 +1,25 @@
+using BUTR.Site.NexusMods.Server.Models.API;
+
+using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Controllers;
+
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Utils.APIResponses;
+
+public sealed class APIResponseProblemDetailsWriter : IProblemDetailsWriter
+{
+    public async ValueTask WriteAsync(ProblemDetailsContext context)
+    {
+        await context.HttpContext.Response.WriteAsJsonAsync(APIResponse.FromError<object>(context.ProblemDetails));
+    }
+
+    public bool CanWrite(ProblemDetailsContext context2)
+    {
+        if (context2.HttpContext.Features.Get<IExceptionHandlerFeature>()?.Endpoint?.Metadata.GetMetadata<ControllerActionDescriptor>() is { } context)
+            return APIResponseUtils.IsReturnTypeAPIResponse(context.MethodInfo);
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseUtils.cs b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseUtils.cs
new file mode 100644
index 00000000..2a9c3287
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/APIResponses/APIResponseUtils.cs
@@ -0,0 +1,16 @@
+using System.Reflection;
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Utils.APIResponses;
+
+public static class APIResponseUtils
+{
+    public static bool IsReturnTypeAPIResponse(MethodInfo methodInfo)
+    {
+        var returnType = methodInfo.ReturnType;
+        if (returnType.IsGenericType && returnType.GetGenericTypeDefinition() is { } typeDef && (typeDef == typeof(Task<>) || typeDef == typeof(ValueTask<>)))
+            returnType = returnType.GenericTypeArguments[0];
+
+        return returnType.IsGenericType && returnType.GetGenericTypeDefinition() == typeof(APIResponseActionResult<>);
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/AuthResponsesOperationFilter.cs b/src/BUTR.Site.NexusMods.Server/Utils/AuthResponsesOperationFilter.cs
index 27ff17f9..e4c0d44f 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/AuthResponsesOperationFilter.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/AuthResponsesOperationFilter.cs
@@ -7,7 +7,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Utils;
 
-public class AuthResponsesOperationFilter : IOperationFilter
+public sealed class AuthResponsesOperationFilter : IOperationFilter
 {
     public void Apply(OpenApiOperation operation, OperationFilterContext? context)
     {
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindApiKeyAttribute.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindApiKeyAttribute.cs
new file mode 100644
index 00000000..18a1002b
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindApiKeyAttribute.cs
@@ -0,0 +1,17 @@
+using BUTR.Authentication.NexusMods.Authentication;
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+public class BindApiKeyAttribute : ValidationAttribute, IBindingSourceMetadata, IModelNameProvider, IBindIgnore
+{
+    public BindingSource BindingSource => ClaimsBindingSource.BindingSource;
+    public string Name => ButrNexusModsClaimTypes.APIKey;
+
+    public override bool IsValid(object? value) => value is not null;
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindIgnoreFilter.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindIgnoreFilter.cs
new file mode 100644
index 00000000..b1748cba
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindIgnoreFilter.cs
@@ -0,0 +1,42 @@
+using Microsoft.AspNetCore.Mvc.ApiExplorer;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+using Microsoft.OpenApi.Models;
+
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+using System.Linq;
+
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+public sealed class BindIgnoreFilter : IOperationFilter
+{
+    public void Apply(OpenApiOperation operation, OperationFilterContext context)
+    {
+        var parametersToHide = context.ApiDescription.ParameterDescriptions
+            .Where(ParameterHasIgnoreAttribute)
+            .ToList();
+
+        if (parametersToHide.Count == 0)
+            return;
+
+        foreach (var parameterToHide in parametersToHide)
+        {
+            var parameter = operation.Parameters.FirstOrDefault(parameter => string.Equals(parameter.Name, parameterToHide.Name, System.StringComparison.OrdinalIgnoreCase));
+            if (parameter != null)
+            {
+                operation.Parameters.Remove(parameter);
+            }
+        }
+
+    }
+
+    private static bool ParameterHasIgnoreAttribute(ApiParameterDescription parameterDescription)
+    {
+        if (parameterDescription.ModelMetadata is DefaultModelMetadata metadata)
+        {
+            return metadata.Attributes.ParameterAttributes?.Any(attribute => attribute.GetType().GetInterfaces().Any(x => x == typeof(IBindIgnore))) == true;
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindRoleAttribute.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindRoleAttribute.cs
new file mode 100644
index 00000000..91c519e4
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindRoleAttribute.cs
@@ -0,0 +1,17 @@
+using BUTR.Authentication.NexusMods.Authentication;
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+public class BindRoleAttribute : ValidationAttribute, IBindingSourceMetadata, IModelNameProvider, IBindIgnore
+{
+    public BindingSource BindingSource => ClaimsBindingSource.BindingSource;
+    public string Name => ButrNexusModsClaimTypes.Role;
+
+    public override bool IsValid(object? value) => value is not null;
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindTenantAttribute.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindTenantAttribute.cs
new file mode 100644
index 00000000..85e3ce43
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindTenantAttribute.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+public sealed class BindTenantAttribute : ValidationAttribute, IBindingSourceMetadata, IModelNameProvider, IFromHeaderMetadata, IBindIgnore
+{
+    public BindingSource BindingSource => BindingSource.Header;
+    public string Name => "Tenant";
+
+    public override bool IsValid(object? value) => value is not null;
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindUserIdAttribute.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindUserIdAttribute.cs
new file mode 100644
index 00000000..98201844
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/BindUserIdAttribute.cs
@@ -0,0 +1,17 @@
+using BUTR.Authentication.NexusMods.Authentication;
+
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+public class BindUserIdAttribute : ValidationAttribute, IBindingSourceMetadata, IModelNameProvider, IBindIgnore
+{
+    public BindingSource BindingSource => ClaimsBindingSource.BindingSource;
+    public string Name => ButrNexusModsClaimTypes.UserId;
+
+    public override bool IsValid(object? value) => value is not null;
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsBindingSource.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsBindingSource.cs
new file mode 100644
index 00000000..d1cd1183
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsBindingSource.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+public class ClaimsBindingSource : BindingSource
+{
+    public static ClaimsBindingSource BindingSource => new();
+    private ClaimsBindingSource() : base("Claims", "Claims", false, true) { }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsValueProvider.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsValueProvider.cs
new file mode 100644
index 00000000..f8a7524b
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsValueProvider.cs
@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+using System.Globalization;
+using System.Linq;
+using System.Security.Claims;
+
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+public class ClaimsValueProvider : BindingSourceValueProvider
+{
+    private readonly ClaimsPrincipal _principal;
+
+    public ClaimsValueProvider(BindingSource bindingSource, ClaimsPrincipal principal) : base(bindingSource)
+    {
+        _principal = principal;
+    }
+
+    public override bool ContainsPrefix(string prefix)
+    {
+        return _principal.HasClaim(claim => claim.Type == prefix);
+    }
+
+    public override ValueProviderResult GetValue(string key)
+    {
+        var claims = _principal.FindAll(key).Select(claim => claim.Value).ToArray();
+        return claims.Length != 0 ? new ValueProviderResult(claims, CultureInfo.InvariantCulture) : ValueProviderResult.None;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsValueProviderFactory.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsValueProviderFactory.cs
new file mode 100644
index 00000000..5ee837c0
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/ClaimsValueProviderFactory.cs
@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+using System;
+using System.Threading.Tasks;
+
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+public class ClaimsValueProviderFactory : IValueProviderFactory
+{
+    public Task CreateValueProviderAsync(ValueProviderFactoryContext context)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+
+        context.ValueProviders.Add(new ClaimsValueProvider(ClaimsBindingSource.BindingSource, context.ActionContext.HttpContext.User));
+
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/IBindIgnore.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/IBindIgnore.cs
new file mode 100644
index 00000000..b82ff59b
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/IBindIgnore.cs
@@ -0,0 +1,3 @@
+namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
+
+public interface IBindIgnore { }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BlockUntilDateConstraint.cs b/src/BUTR.Site.NexusMods.Server/Utils/BlockUntilDateConstraint.cs
index de113095..cf2ed6f6 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/BlockUntilDateConstraint.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BlockUntilDateConstraint.cs
@@ -6,7 +6,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Utils;
 
-public class BlockUntilDateConstraint : IAwaitableConstraint
+public sealed class BlockUntilDateConstraint : IAwaitableConstraint
 {
     private class DummyDisposable : IDisposable
     {
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/ButrNexusModsAuthorizationAttribute.cs b/src/BUTR.Site.NexusMods.Server/Utils/ButrNexusModsAuthorizationAttribute.cs
new file mode 100644
index 00000000..01649e30
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/ButrNexusModsAuthorizationAttribute.cs
@@ -0,0 +1,13 @@
+using BUTR.Authentication.NexusMods.Authentication;
+
+using Microsoft.AspNetCore.Authorization;
+
+namespace BUTR.Site.NexusMods.Server.Utils;
+
+public class ButrNexusModsAuthorizationAttribute : AuthorizeAttribute
+{
+    public ButrNexusModsAuthorizationAttribute()
+    {
+        AuthenticationSchemes = ButrNexusModsAuthSchemeConstants.AuthScheme;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/CopyHelper.cs b/src/BUTR.Site.NexusMods.Server/Utils/CopyHelper.cs
new file mode 100644
index 00000000..86446d25
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/CopyHelper.cs
@@ -0,0 +1,28 @@
+using System.Reflection;
+
+namespace BUTR.Site.NexusMods.Server.Utils;
+
+internal static class CopyHelper
+{
+    public static T CopyPublicProperties<T>(T oldObject, T newObject) where T : class
+    {
+        const BindingFlags flags = BindingFlags.Public | BindingFlags.Instance;
+
+        if (ReferenceEquals(oldObject, newObject)) return newObject;
+
+        var type = typeof(T);
+        var propertyList = type.GetProperties(flags);
+        if (propertyList.Length <= 0) return newObject;
+
+        foreach (var newObjProp in propertyList)
+        {
+            var oldProp = type.GetProperty(newObjProp.Name, flags)!;
+            if (!oldProp.CanRead || !newObjProp.CanWrite) continue;
+
+            var value = oldProp.GetValue(oldObject);
+            newObjProp.SetValue(newObject, value);
+        }
+
+        return newObject;
+    }
+}
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/HttpRangeStream.cs b/src/BUTR.Site.NexusMods.Server/Utils/Http/HttpRangeStream.cs
similarity index 95%
rename from src/BUTR.Site.NexusMods.Server/Utils/HttpRangeStream.cs
rename to src/BUTR.Site.NexusMods.Server/Utils/Http/HttpRangeStream.cs
index d72f7066..d5e031be 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/HttpRangeStream.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Http/HttpRangeStream.cs
@@ -8,7 +8,7 @@
 using System.Net.Http.Headers;
 using System.Threading;
 
-namespace BUTR.Site.NexusMods.Server.Utils;
+namespace BUTR.Site.NexusMods.Server.Utils.Http;
 
 public sealed record HttpRangeOptions
 {
@@ -97,15 +97,10 @@ private bool TryRead(Uri url, Span<byte> buffer, long from, long to, out int rea
 
         try
         {
-            using var request = new HttpRequestMessage
-            {
-                RequestUri = url,
-                Method = HttpMethod.Get,
-                Headers =
-                {
-                    Range = new RangeHeaderValue(from, to)
-                },
-            };
+            using var request = new HttpRequestMessage();
+            request.RequestUri = url;
+            request.Method = HttpMethod.Get;
+            request.Headers.Range = new RangeHeaderValue(from, to);
 
             using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(20));
             using var response = _httpClient.Send(request, HttpCompletionOption.ResponseHeadersRead, cts.Token);
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingHttpMessageHandler.cs b/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingHttpMessageHandler.cs
index e4edcb5e..f88d2879 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingHttpMessageHandler.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingHttpMessageHandler.cs
@@ -112,7 +112,7 @@ public static void RequestEnd(ILogger logger, HttpResponseMessage response, Time
                 logger.Log(
                     LogLevel.Trace,
                     EventIds.ResponseHeader,
-                    new HttpHeadersLogValue(HttpHeadersLogValue.Kind.Response, response.Headers, response.Content?.Headers, shouldRedactHeaderValue),
+                    new HttpHeadersLogValue(HttpHeadersLogValue.Kind.Response, response.Headers, response.Content.Headers, shouldRedactHeaderValue),
                     null,
                     (state, ex) => state.ToString());
             }
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingScopeHttpMessageHandler.cs b/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingScopeHttpMessageHandler.cs
index 428c3b52..7b46b9dd 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingScopeHttpMessageHandler.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingScopeHttpMessageHandler.cs
@@ -114,7 +114,7 @@ public static void RequestPipelineEnd(ILogger logger, HttpResponseMessage respon
                 logger.Log(
                     LogLevel.Trace,
                     EventIds.ResponseHeader,
-                    new HttpHeadersLogValue(HttpHeadersLogValue.Kind.Response, response.Headers, response.Content?.Headers, shouldRedactHeaderValue),
+                    new HttpHeadersLogValue(HttpHeadersLogValue.Kind.Response, response.Headers, response.Content.Headers, shouldRedactHeaderValue),
                     null,
                     (state, ex) => state.ToString());
             }
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/ImmutableArrayToArrayConverter.cs b/src/BUTR.Site.NexusMods.Server/Utils/Npgsql/ImmutableArrayToArrayConverter.cs
similarity index 79%
rename from src/BUTR.Site.NexusMods.Server/Utils/ImmutableArrayToArrayConverter.cs
rename to src/BUTR.Site.NexusMods.Server/Utils/Npgsql/ImmutableArrayToArrayConverter.cs
index de54b1f9..91a3378f 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/ImmutableArrayToArrayConverter.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Npgsql/ImmutableArrayToArrayConverter.cs
@@ -5,9 +5,9 @@
 using System.Collections.Immutable;
 using System.Runtime.CompilerServices;
 
-namespace BUTR.Site.NexusMods.Server.Utils;
+namespace BUTR.Site.NexusMods.Server.Utils.Npgsql;
 
-public class ImmutableArrayToArrayConverter<T> : ValueConverter<ImmutableArray<T>, T[]>, INpgsqlArrayConverter
+public sealed class ImmutableArrayToArrayConverter<T> : ValueConverter<ImmutableArray<T>, T[]>, INpgsqlArrayConverter
 {
     private static ImmutableArray<T> ToImmutableArray(T[] array) => Unsafe.As<T[], ImmutableArray<T>>(ref array);
     private static T[] ToArray(ImmutableArray<T> immutableArray) => Unsafe.As<ImmutableArray<T>, T[]>(ref immutableArray);
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/PlainTextOutput2.cs b/src/BUTR.Site.NexusMods.Server/Utils/PlainTextOutput2.cs
deleted file mode 100644
index 960235ae..00000000
--- a/src/BUTR.Site.NexusMods.Server/Utils/PlainTextOutput2.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using BUTR.Site.NexusMods.Server.Extensions;
-
-using ICSharpCode.Decompiler;
-using ICSharpCode.Decompiler.CSharp.Syntax;
-using ICSharpCode.Decompiler.Disassembler;
-using ICSharpCode.Decompiler.Metadata;
-using ICSharpCode.Decompiler.TypeSystem;
-
-using System;
-using System.IO;
-using System.Reflection.Metadata;
-using System.Text;
-
-namespace BUTR.Site.NexusMods.Server.Utils;
-
-public class PlainTextOutput2 : ITextOutput
-{
-    private readonly TextWriter _writer;
-    private int _indent;
-    private bool _needsIndent;
-
-    private int _line = 1;
-    private int _column = 1;
-
-	public string IndentationString { get; set; } = "\t";
-
-	public PlainTextOutput2(TextWriter writer) => _writer = writer ?? throw new ArgumentNullException(nameof(writer));
-
-    public PlainTextOutput2() => _writer = new StringWriter();
-
-    public TextLocation Location => new(_line, _column + (_needsIndent ? _indent : 0));
-
-    public override string? ToString() => _writer.ToString();
-
-    public void Indent() => _indent++;
-
-    public void Unindent() => _indent--;
-
-    void WriteIndent()
-	{
-		if (_needsIndent)
-		{
-			_needsIndent = false;
-			for (var i = 0; i < _indent; i++)
-			{
-				_writer.Write(IndentationString);
-			}
-			_column += _indent;
-		}
-	}
-
-    public void Write(ReadOnlySpan<char> span)
-    {
-        WriteIndent();
-        _writer.Write(span);
-        _column += span.Length;
-    }
-    
-    public void Write(StringBuilder sb, int offset, int length)
-    {
-        WriteIndent();
-        _writer.Write(sb, offset, length);
-        _column += length;
-    }
-    
-	public void Write(char ch)
-	{
-		WriteIndent();
-		_writer.Write(ch);
-		_column++;
-	}
-
-	public void Write(string text)
-	{
-		WriteIndent();
-		_writer.Write(text);
-		_column += text.Length;
-	}
-
-	public void WriteLine()
-	{
-		_writer.WriteLine();
-		_needsIndent = true;
-		_line++;
-		_column = 1;
-	}
-
-	public void WriteLine(ReadOnlySpan<char> line)
-	{
-		_writer.WriteLine(line);
-		_needsIndent = true;
-		_line++;
-		_column = 1;
-	}
-
-	public void WriteReference(OpCodeInfo opCode, bool omitSuffix = false)
-	{
-		if (omitSuffix)
-		{
-			var lastDot = opCode.Name.LastIndexOf('.');
-			if (lastDot > 0)
-			{
-				Write(opCode.Name.Remove(lastDot + 1));
-			}
-		}
-		else
-		{
-			Write(opCode.Name);
-		}
-	}
-
-	public void WriteReference(PEFile module, Handle handle, string text, string protocol = "decompile", bool isDefinition = false)
-	{
-		Write(text);
-	}
-
-	public void WriteReference(IType type, string text, bool isDefinition = false)
-	{
-		Write(text);
-	}
-
-	public void WriteReference(IMember member, string text, bool isDefinition = false)
-	{
-		Write(text);
-	}
-
-	public void WriteLocalReference(string text, object reference, bool isDefinition = false)
-	{
-		Write(text);
-	}
-
-	void ITextOutput.MarkFoldStart(string collapsedText, bool defaultCollapsed, bool isDefinition) { }
-
-	void ITextOutput.MarkFoldEnd() { }    
-}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/JobDataMapKeys.cs b/src/BUTR.Site.NexusMods.Server/Utils/Quartz/JobDataMapKeys.cs
similarity index 78%
rename from src/BUTR.Site.NexusMods.Server/Utils/JobDataMapKeys.cs
rename to src/BUTR.Site.NexusMods.Server/Utils/Quartz/JobDataMapKeys.cs
index 8f9420d3..0797fbd8 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/JobDataMapKeys.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Quartz/JobDataMapKeys.cs
@@ -1,4 +1,4 @@
-namespace BUTR.Site.NexusMods.Server.Utils;
+namespace BUTR.Site.NexusMods.Server.Utils.Quartz;
 
 public static class JobDataMapKeys
 {
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/RecreateStacktraceUtils.cs b/src/BUTR.Site.NexusMods.Server/Utils/RecreateStacktraceUtils.cs
index 4ea252a8..887be297 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/RecreateStacktraceUtils.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/RecreateStacktraceUtils.cs
@@ -25,7 +25,7 @@ public static IEnumerable<RecreatedStacktrace> GetRecreatedStacktrace(IEnumerabl
     {
         var methods = crashReport.EnhancedStacktrace.Select(y => y.OriginalMethod).ToArray();
         return GetRecreatedStacktraceUnordered(assemblyFiles, crashReport, ct)
-            .OrderBy(x => Array.FindIndex(methods, y => y.Method == x.Method));
+            .OrderBy(x => Array.FindIndex(methods, y => y.MethodName == x.Method)); // Was Method isntead of MethodName
 
     }
     public static IEnumerable<RecreatedStacktrace> GetRecreatedStacktraceUnordered(IEnumerable<string> assemblyFiles, CrashReportModel crashReport, CancellationToken ct)
@@ -133,8 +133,8 @@ static IEnumerable<RecreatedStacktrace> RecreatedStacktrace(PEFile moduleDefinit
             using var _ = moduleDefinition;
             foreach (var frame in crashReport.EnhancedStacktrace)
             {
-                var methodName = GetMethodNameWithoutGenericTypeParametersAndParameterNames(frame.OriginalMethod.Method);
-                var methodFullName = GetMethodNameWithoutGenericTypeParametersAndParameterNames(frame.OriginalMethod.MethodFullName);
+                var methodName = GetMethodNameWithoutGenericTypeParametersAndParameterNames(frame.OriginalMethod.MethodName);  // Was Method isntead of MethodName
+                var methodFullName = GetMethodNameWithoutGenericTypeParametersAndParameterNames(frame.OriginalMethod.MethodFullDescription);  // Was MethodFullName isntead of MethodName
 
                 var utf8MethodName = Encoding.UTF8.GetBytes(methodName);
                 var foundMethods = moduleDefinition.Metadata.TypeDefinitions.Select(moduleDefinition.Metadata.GetTypeDefinition).Where(x =>
@@ -216,7 +216,7 @@ static IEnumerable<RecreatedStacktrace> RecreatedStacktrace(PEFile moduleDefinit
                 var code = output.ToString()!;
                 var lineNumber = GetLineNumber(code, frame.ILOffset ?? 0);
 
-                yield return new RecreatedStacktrace(frame.OriginalMethod.Method, code, lineNumber);
+                yield return new RecreatedStacktrace(frame.OriginalMethod.MethodName, code, lineNumber); // Was Method isntead of MethodName
             }
         }
 
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/CSharpILMixedLanguage.cs b/src/BUTR.Site.NexusMods.Server/Utils/Reflection/CSharpILMixedLanguage.cs
similarity index 97%
rename from src/BUTR.Site.NexusMods.Server/Utils/CSharpILMixedLanguage.cs
rename to src/BUTR.Site.NexusMods.Server/Utils/Reflection/CSharpILMixedLanguage.cs
index ab7439b9..88f413da 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/CSharpILMixedLanguage.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Reflection/CSharpILMixedLanguage.cs
@@ -16,7 +16,7 @@
 using System.Text;
 using System.Threading;
 
-namespace BUTR.Site.NexusMods.Server.Utils;
+namespace BUTR.Site.NexusMods.Server.Utils.Reflection;
 
 internal static class CSharpILMixedLanguage
 {
@@ -133,6 +133,8 @@ protected override void WriteInstruction(ITextOutput output, MetadataReader meta
                 {
                     for (var line = info.StartLine; line <= info.EndLine; line++)
                     {
+                        //if (_stringBuilderLinesIndices.Count < line) continue; // TODO:
+
                         plainTextOutput2.WriteLine();
                         plainTextOutput2.Write("// ");
 
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Reflection/SignatureType.cs b/src/BUTR.Site.NexusMods.Server/Utils/Reflection/SignatureType.cs
index 5a04081c..ecd04946 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Reflection/SignatureType.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Reflection/SignatureType.cs
@@ -26,7 +26,7 @@ internal record SignatureType
     public bool IsFunctionPointer { get; set; }
     public MethodSignature<SignatureType> FunctionPointerSignature { get; set; }
 
-    public override string? ToString()
+    public override string ToString()
     {
         var name = IsRef ? $"{Name}&" : Name;
         return IsGeneric
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/ResponseContentTypeHelper.cs b/src/BUTR.Site.NexusMods.Server/Utils/ResponseContentTypeHelper.cs
new file mode 100644
index 00000000..8b34ad43
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/ResponseContentTypeHelper.cs
@@ -0,0 +1,68 @@
+using Microsoft.AspNetCore.Http;
+
+using System;
+using System.Net.Mime;
+using System.Text;
+
+namespace BUTR.Site.NexusMods.Server.Utils;
+
+// Taken from an internal class Microsoft.AspNetCore.Internal.ResponseContentTypeHelper
+internal static class ResponseContentTypeHelper
+{
+    /// <summary>
+    /// Gets the content type and encoding that need to be used for the response.
+    /// The priority for selecting the content type is:
+    /// 1. ContentType property set on the action result
+    /// 2. <see cref="ContentType"/> property set on <see cref="HttpResponse"/>
+    /// 3. Default content type set on the action result
+    /// </summary>
+    /// <remarks>
+    /// The user supplied content type is not modified and is used as is. For example, if user
+    /// sets the content type to be "text/plain" without any encoding, then the default content type's
+    /// encoding is used to write the response and the ContentType header is set to be "text/plain" without any
+    /// "charset" information.
+    /// </remarks>
+    public static void ResolveContentTypeAndEncoding(
+        /*string? actionResultContentType,*/
+        string? httpResponseContentType,
+        (string defaultContentType, Encoding defaultEncoding) @default,
+        Func<string, Encoding?> getEncoding,
+        out string resolvedContentType,
+        out Encoding resolvedContentTypeEncoding)
+    {
+        var (defaultContentType, defaultContentTypeEncoding) = @default;
+
+        // 1. User sets the ContentType property on the action result
+        /*
+        if (actionResultContentType != null)
+        {
+            resolvedContentType = actionResultContentType;
+            var actionResultEncoding = getEncoding(actionResultContentType);
+            resolvedContentTypeEncoding = actionResultEncoding ?? defaultContentTypeEncoding;
+            return;
+        }
+        */
+
+        // 2. User sets the ContentType property on the http response directly
+        if (!string.IsNullOrEmpty(httpResponseContentType))
+        {
+            var mediaTypeEncoding = getEncoding(httpResponseContentType);
+            if (mediaTypeEncoding != null)
+            {
+                resolvedContentType = httpResponseContentType;
+                resolvedContentTypeEncoding = mediaTypeEncoding;
+            }
+            else
+            {
+                resolvedContentType = httpResponseContentType;
+                resolvedContentTypeEncoding = defaultContentTypeEncoding;
+            }
+
+            return;
+        }
+
+        // 3. Fall-back to the default content type
+        resolvedContentType = defaultContentType;
+        resolvedContentTypeEncoding = defaultContentTypeEncoding;
+    }
+}
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/TenantNotRequiredAttribute.cs b/src/BUTR.Site.NexusMods.Server/Utils/TenantNotRequiredAttribute.cs
new file mode 100644
index 00000000..99e247a3
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/TenantNotRequiredAttribute.cs
@@ -0,0 +1,32 @@
+using Microsoft.AspNetCore.Mvc.Filters;
+
+using System;
+using System.Linq;
+
+namespace BUTR.Site.NexusMods.Server.Utils;
+
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+public sealed class TenantNotRequiredAttribute : Attribute, IResourceFilter
+{
+    private sealed class NopFilter : IResourceFilter
+    {
+        void IResourceFilter.OnResourceExecuting(ResourceExecutingContext context) { }
+        void IResourceFilter.OnResourceExecuted(ResourceExecutedContext context) { }
+    }
+
+    public void OnResourceExecuting(ResourceExecutingContext context)
+    {
+        var idxThis = context.Filters.IndexOf(this);
+        var idxRequired = context.Filters.Select((x, i) => (x, i)).Where(x => x.x is TenantRequiredAttribute).Select(x => x.i).FirstOrDefault(-1);
+        if (idxThis < idxRequired)
+            return;
+
+        for (var i = 0; i < context.Filters.Count; i++)
+        {
+            if (context.Filters[i] is TenantRequiredAttribute)
+                context.Filters[i] = new NopFilter();
+        }
+    }
+
+    public void OnResourceExecuted(ResourceExecutedContext context) { }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/TenantRequiredAttribute.cs b/src/BUTR.Site.NexusMods.Server/Utils/TenantRequiredAttribute.cs
new file mode 100644
index 00000000..4ec04e3e
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/TenantRequiredAttribute.cs
@@ -0,0 +1,55 @@
+using BUTR.Site.NexusMods.Server.Contexts;
+using BUTR.Site.NexusMods.Server.Models;
+using BUTR.Site.NexusMods.Server.Models.API;
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.DependencyInjection;
+
+using System;
+using System.Linq;
+
+namespace BUTR.Site.NexusMods.Server.Utils;
+
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+public sealed class TenantRequiredAttribute : Attribute, IResourceFilter
+{
+    private sealed class NopFilter : IResourceFilter
+    {
+        void IResourceFilter.OnResourceExecuting(ResourceExecutingContext context) { }
+        void IResourceFilter.OnResourceExecuted(ResourceExecutedContext context) { }
+    }
+
+    public void OnResourceExecuting(ResourceExecutingContext context)
+    {
+        var idxThis = context.Filters.IndexOf(this);
+        var idxNotRequired = context.Filters.Select((x, i) => (x, i)).Where(x => x.x is TenantNotRequiredAttribute).Select(x => x.i).FirstOrDefault(-1);
+        if (idxThis < idxNotRequired)
+            return;
+
+        for (var i = 0; i < context.Filters.Count; i++)
+        {
+            if (context.Filters[i] is TenantNotRequiredAttribute)
+                context.Filters[i] = new NopFilter();
+        }
+
+        if (context.HttpContext.RequestServices.GetRequiredService<ITenantContextAccessor>() is not { } tenantContextAccessor)
+            return;
+
+        if (context.HttpContext.RequestServices.GetRequiredService<ProblemDetailsFactory>() is not { } problemDetailsFactory)
+            return;
+
+        if (tenantContextAccessor.Current == TenantId.None)
+        {
+            var modelStateDictionary = new ModelStateDictionary();
+            modelStateDictionary.AddModelError("Tenant", "The field tenant is invalid.");
+            var validationProblemDetails = problemDetailsFactory.CreateValidationProblemDetails(context.HttpContext, modelStateDictionary);
+
+            context.Result = new ObjectResult(APIResponse.FromError<object>(validationProblemDetails));
+        }
+    }
+
+    public void OnResourceExecuted(ResourceExecutedContext context) { }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasCopy.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasCopy.cs
new file mode 100644
index 00000000..19ee60fe
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasCopy.cs
@@ -0,0 +1,6 @@
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public interface IHasCopy<TVogen>
+{
+    static abstract TVogen Copy(TVogen instance);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDefaultValue.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDefaultValue.cs
new file mode 100644
index 00000000..145edc24
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDefaultValue.cs
@@ -0,0 +1,6 @@
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public interface IHasDefaultValue<out TVogen>
+{
+    public static abstract TVogen DefaultValue { get; }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDeserialize.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDeserialize.cs
new file mode 100644
index 00000000..9c67ff99
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDeserialize.cs
@@ -0,0 +1,6 @@
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public interface IHasDeserialize<out TVogen, in TValueObject>
+{
+    static abstract TVogen DeserializeDangerous(TValueObject instance);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasIsInitialized.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasIsInitialized.cs
new file mode 100644
index 00000000..25cd24a5
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasIsInitialized.cs
@@ -0,0 +1,6 @@
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public interface IHasIsInitialized<in TVogen>
+{
+    static abstract bool IsInitialized(TVogen instance);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasRandomValueGenerator.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasRandomValueGenerator.cs
new file mode 100644
index 00000000..58802077
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasRandomValueGenerator.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public interface IHasRandomValueGenerator<out TVogen, out TValueObject, in TRandom>
+    where TVogen : IVogen<TVogen, TValueObject>
+    where TValueObject : notnull
+    where TRandom : Random
+{
+    static abstract TVogen NewRandomValue(TRandom? random);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IVogen.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IVogen.cs
new file mode 100644
index 00000000..91b6c608
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IVogen.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public interface IVogen<TVogen, TValueObject> : IHasIsInitialized<TVogen>, IHasDeserialize<TVogen, TValueObject>, IHasCopy<TVogen>
+    where TVogen : IVogen<TVogen, TValueObject>
+    where TValueObject : notnull
+{
+    static abstract explicit operator TVogen(TValueObject value);
+    static abstract explicit operator TValueObject(TVogen value);
+
+    static abstract bool operator ==(TVogen left, TVogen right);
+    static abstract bool operator !=(TVogen left, TVogen right);
+
+    static abstract bool operator ==(TVogen left, TValueObject right);
+    static abstract bool operator !=(TVogen left, TValueObject right);
+
+    static abstract bool operator ==(TValueObject left, TVogen right);
+    static abstract bool operator !=(TValueObject left, TVogen right);
+
+    static abstract TVogen From(TValueObject value);
+
+    static abstract int GetHashCode(TVogen value);
+
+    static abstract bool Equals(TVogen left, TVogen right);
+    static abstract bool Equals(TVogen left, TVogen right, IEqualityComparer<TVogen> comparer);
+
+    static abstract int CompareTo(TVogen left, TVogen right);
+}
+
+
+public interface IVogenParsable<TVogen, TValueObject>
+    where TVogen : IVogen<TVogen, TValueObject>
+    where TValueObject : IParsable<TValueObject>
+{
+    static abstract bool TryParse(ReadOnlySpan<byte> utf8Text, IFormatProvider provider, [NotNullWhen(true)] out TVogen? result);
+    static abstract bool TryParse(ReadOnlySpan<byte> utf8Text, [NotNullWhen(true)] out TVogen? result);
+}
+
+
+public interface IVogenSpanParsable<TVogen, TValueObject>
+    where TVogen : IVogen<TVogen, TValueObject>
+    where TValueObject : ISpanParsable<TValueObject>
+{
+    static abstract bool TryParse(ReadOnlySpan<char> s, IFormatProvider provider, [NotNullWhen(true)] out TVogen? result);
+    static abstract bool TryParse(ReadOnlySpan<char> s, [NotNullWhen(true)] out TVogen? result);
+}
+
+
+public interface IVogenUtf8SpanParsable<TVogen, TValueObject>
+    where TVogen : IVogen<TVogen, TValueObject>
+    where TValueObject : IUtf8SpanParsable<TValueObject>
+{
+    static abstract bool TryParse(string s, IFormatProvider provider, [NotNullWhen(true)] out TVogen? result);
+    static abstract bool TryParse(string s, [NotNullWhen(true)] out TVogen? result);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaults.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaults.cs
new file mode 100644
index 00000000..2e245dcd
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaults.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public static class VogenDefaults<TVogen, TValueObject>
+    where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
+    where TValueObject : notnull
+{
+    public static TVogen Copy(TVogen value) => TVogen.Copy(value);
+
+    public static TVogen Deserialize(TValueObject value) => TVogen.DeserializeDangerous(value);
+
+    public static TValueObject Convert(TVogen value) => (TValueObject) value;
+    public static TVogen Convert(TValueObject value) => (TVogen) value;
+
+    public static int GetHashCode(TVogen value) => TVogen.IsInitialized(value) ? value.GetHashCode() : 0;
+
+    public static bool Equals(TVogen left, TVogen right)
+    {
+        var leftInitialized = TVogen.IsInitialized(left);
+        var rightInitialized = TVogen.IsInitialized(right);
+        return (!leftInitialized && !rightInitialized) || (leftInitialized && rightInitialized && left.Equals(right));
+    }
+
+    public static bool Equals(TVogen left, TVogen right, IEqualityComparer<TVogen> comparer)
+    {
+        var leftInitialized = TVogen.IsInitialized(left);
+        var rightInitialized = TVogen.IsInitialized(right);
+        return (!leftInitialized && !rightInitialized) || (leftInitialized && rightInitialized && comparer.Equals(left, right));
+    }
+
+    public static int CompareTo(TVogen left, TVogen right)
+    {
+        var leftInitialized = TVogen.IsInitialized(left);
+        var rightInitialized = TVogen.IsInitialized(right);
+        return !leftInitialized && !rightInitialized ? 0 : !leftInitialized ? -1 : !rightInitialized ? 1 : left.CompareTo(right);
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsParsable.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsParsable.cs
new file mode 100644
index 00000000..e12106d0
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsParsable.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public static class VogenDefaultsParsable<TVogen, TValueObject>
+    where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
+    where TValueObject : IParsable<TValueObject>
+{
+    public static bool TryParse(string s, IFormatProvider provider, [NotNullWhen(true)] out TVogen? result)
+    {
+        if(TValueObject.TryParse(s, provider, out var r))
+        {
+            result = TVogen.From(r);
+            return true;
+        }
+
+        result = default;
+        return false;
+    }
+
+    public static bool TryParse(string s, [NotNullWhen(true)] out TVogen? result)
+    {
+        if(TValueObject.TryParse(s, null, out var r))
+        {
+            result = TVogen.From(r);
+            return true;
+        }
+
+        result = default;
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsRandomValueGenerator.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsRandomValueGenerator.cs
new file mode 100644
index 00000000..ae100ffa
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsRandomValueGenerator.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public static class VogenDefaultsRandomValueGenerator<TValue, TValueObject, TRandom>
+    where TValue : IVogen<TValue, TValueObject>, IHasRandomValueGenerator<TValue, TValueObject, TRandom>
+    where TValueObject : unmanaged
+    where TRandom : Random, new()
+{
+    public static TValue NewRandomValue()
+    {
+        var size = Unsafe.SizeOf<TValueObject>();
+
+        var random = new TRandom();
+        Span<byte> bytes = stackalloc byte[size];
+        random.NextBytes(bytes);
+
+        var id = MemoryMarshal.Cast<byte, TValueObject>(bytes)[0];
+        return TValue.From(id);
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsSpanParsable.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsSpanParsable.cs
new file mode 100644
index 00000000..214e7d23
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsSpanParsable.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public static class VogenDefaultsSpanParsable<TVogen, TValueObject>
+    where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
+    where TValueObject : ISpanParsable<TValueObject>
+{
+    public static bool TryParse(ReadOnlySpan<char> s, IFormatProvider provider, [NotNullWhen(true)] out TVogen? result)
+    {
+        if(TValueObject.TryParse(s, provider, out var r))
+        {
+            result = TVogen.From(r);
+            return true;
+        }
+
+        result = default;
+        return false;
+    }
+
+    public static bool TryParse(ReadOnlySpan<char> s, [NotNullWhen(true)] out TVogen? result)
+    {
+        if(TValueObject.TryParse(s, null, out var r))
+        {
+            result = TVogen.From(r);
+            return true;
+        }
+
+        result = default;
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsUtf8SpanParsable.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsUtf8SpanParsable.cs
new file mode 100644
index 00000000..2b740532
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsUtf8SpanParsable.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public static class VogenDefaultsUtf8SpanParsable<TVogen, TValueObject>
+    where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
+    where TValueObject : IUtf8SpanParsable<TValueObject>
+{
+    public static bool TryParse(ReadOnlySpan<byte> utf8Text, IFormatProvider provider, [NotNullWhen(true)] out TVogen? result)
+    {
+        if(TValueObject.TryParse(utf8Text, provider, out var r))
+        {
+            result = TVogen.From(r);
+            return true;
+        }
+
+        result = default;
+        return false;
+    }
+
+    public static bool TryParse(ReadOnlySpan<byte> utf8Text, [NotNullWhen(true)] out TVogen? result)
+    {
+        if(TValueObject.TryParse(utf8Text, null, out var r))
+        {
+            result = TVogen.From(r);
+            return true;
+        }
+
+        result = default;
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenJsonConverter.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenJsonConverter.cs
new file mode 100644
index 00000000..52408b1f
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenJsonConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public class VogenJsonConverter<TVogen, TValueObject> : JsonConverter<TVogen>
+    where TVogen : struct, IVogen<TVogen, TValueObject>, IHasIsInitialized<TVogen>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
+    where TValueObject : notnull
+{
+    public override TVogen Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var primitive = JsonSerializer.Deserialize<TValueObject>(ref reader, options)!;
+        return TVogen.DeserializeDangerous(primitive);
+    }
+
+    public override void Write(Utf8JsonWriter writer, TVogen value, JsonSerializerOptions options)
+    {
+        JsonSerializer.Serialize(writer, (TValueObject) value, options);
+    }
+
+    public override TVogen ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        //return Read(ref reader, typeToConvert, options);
+
+        var primitive = JsonSerializer.Deserialize<TValueObject>(ref reader, options)!;
+        return TVogen.DeserializeDangerous(primitive);
+    }
+
+    public override void WriteAsPropertyName(Utf8JsonWriter writer, TVogen value, JsonSerializerOptions options)
+    {
+        writer.WritePropertyName(JsonSerializer.Serialize((TValueObject) value, options));
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenSchemaFilter.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenSchemaFilter.cs
new file mode 100644
index 00000000..0d1f4464
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenSchemaFilter.cs
@@ -0,0 +1,22 @@
+using Microsoft.OpenApi.Models;
+
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+using System.Linq;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public sealed class VogenSchemaFilter : ISchemaFilter
+{
+    public void Apply(OpenApiSchema schema, SchemaFilterContext context)
+    {
+        if (context.Type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IVogen<,>)) is not { } vogen)
+            return;
+
+        if (vogen.GetGenericArguments() is not [_, { } valueObject])
+            return;
+
+        var schemaValueObject = context.SchemaGenerator.GenerateSchema(valueObject, context.SchemaRepository, context.MemberInfo, context.ParameterInfo);
+        CopyHelper.CopyPublicProperties(schemaValueObject, schema);
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenTypeConverter.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenTypeConverter.cs
new file mode 100644
index 00000000..d454feae
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenTypeConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public class VogenTypeConverter<TVogen, TValueObject> : TypeConverter
+    where TVogen : struct, IVogen<TVogen, TValueObject>, IHasIsInitialized<TVogen>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
+    where TValueObject : notnull
+{
+    public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
+        sourceType == typeof(TValueObject) || base.CanConvertFrom(context, sourceType);
+
+    public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) =>
+        value is TValueObject valValue ? TVogen.DeserializeDangerous(valValue) : base.ConvertFrom(context, culture, value);
+
+    public override bool CanConvertTo(ITypeDescriptorContext? context, Type? sourceType) =>
+        sourceType == typeof(TVogen) || base.CanConvertTo(context, sourceType);
+
+    public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType) => value is TVogen idValue
+        ? destinationType == typeof(TValueObject) ? (TValueObject) idValue : base.ConvertTo(context, culture, value, destinationType)
+        : base.ConvertTo(context, culture, value, destinationType);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparer.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparer.cs
new file mode 100644
index 00000000..92dc1d9f
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparer.cs
@@ -0,0 +1,18 @@
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+
+using System;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public class VogenValueComparer<TVogen, TValueObject> : ValueComparer<TVogen>
+    where TVogen : struct, IVogen<TVogen, TValueObject>, IHasIsInitialized<TVogen>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
+    where TValueObject : notnull
+{
+    public VogenValueComparer() : base(
+        (left, right) => VogenDefaults<TVogen, TValueObject>.Equals(left, right),
+        instance => VogenDefaults<TVogen, TValueObject>.GetHashCode(instance),
+        instance => VogenDefaults<TVogen, TValueObject>.Copy(instance)) { }
+
+    public override int GetHashCode(TVogen instance) => VogenDefaults<TVogen, TValueObject>.GetHashCode(instance);
+    public override bool Equals(TVogen left, TVogen right) => VogenDefaults<TVogen, TValueObject>.Equals(left, right);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparerReference.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparerReference.cs
new file mode 100644
index 00000000..09dfe489
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparerReference.cs
@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+
+using System;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public class VogenValueComparerReference<TVogen, TValueObject> : ValueComparer<TVogen>
+    where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
+    where TValueObject : notnull
+{
+    public VogenValueComparerReference() : base(
+        CreateDefaultEqualsExpression(),
+        instance => VogenDefaults<TVogen, TValueObject>.GetHashCode(instance),
+        instance => VogenDefaults<TVogen, TValueObject>.Copy(instance)) { }
+
+    public override int GetHashCode(TVogen instance) => VogenDefaults<TVogen, TValueObject>.GetHashCode(instance);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueConverter.cs b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueConverter.cs
new file mode 100644
index 00000000..86ec6026
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueConverter.cs
@@ -0,0 +1,15 @@
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+using System;
+
+namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+
+public class VogenValueConverter<TVogen, TValueObject> : ValueConverter<TVogen, TValueObject>
+    where TVogen : struct, IVogen<TVogen, TValueObject>, IHasIsInitialized<TVogen>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
+    where TValueObject : notnull
+{
+    public VogenValueConverter() : this(null) { }
+    public VogenValueConverter(ConverterMappingHints? mappingHints = null) : base(
+        vo => VogenDefaults<TVogen, TValueObject>.Convert(vo),
+        value => VogenDefaults<TVogen, TValueObject>.Deserialize(value), mappingHints) { }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/VogenSchemaGenerator.cs b/src/BUTR.Site.NexusMods.Server/Utils/VogenSchemaGenerator.cs
deleted file mode 100644
index 75f92012..00000000
--- a/src/BUTR.Site.NexusMods.Server/Utils/VogenSchemaGenerator.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.OpenApi.Models;
-
-using Swashbuckle.AspNetCore.SwaggerGen;
-
-using System;
-using System.Reflection;
-
-using Vogen;
-
-namespace BUTR.Site.NexusMods.Server.Utils;
-
-public class VogenSchemaFilter : ISchemaFilter
-{
-    public void Apply(OpenApiSchema schema, SchemaFilterContext context)
-    {
-        if (context.Type.GetCustomAttribute<ValueObjectAttribute<string>>() is not null)
-        {
-            schema.Type = "string";
-            schema.Format = "";
-        }
-        if (context.Type.GetCustomAttribute<ValueObjectAttribute<byte>>() is not null)
-        {
-            schema.Type = "integer";
-            schema.Format = "";
-        }
-        if (context.Type.GetCustomAttribute<ValueObjectAttribute<int>>() is not null)
-        {
-            schema.Type = "integer";
-            schema.Format = "";
-        }
-        if (context.Type.GetCustomAttribute<ValueObjectAttribute<Guid>>() is not null)
-        {
-            schema.Type = "string";
-            schema.Format = "uuid";
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.ServerClient/BUTR.Site.NexusMods.ServerClient.csproj b/src/BUTR.Site.NexusMods.ServerClient/BUTR.Site.NexusMods.ServerClient.csproj
index 41a5b507..73ff8a86 100644
--- a/src/BUTR.Site.NexusMods.ServerClient/BUTR.Site.NexusMods.ServerClient.csproj
+++ b/src/BUTR.Site.NexusMods.ServerClient/BUTR.Site.NexusMods.ServerClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +17,7 @@
       <ExecPreprocessArgs Include="/input:../swagger.json /classname:&quot;{controller}Client&quot; /namespace:$(RootNamespace) /output:Clients.g.cs" />
       <ExecPreprocessArgs Include="/InjectHttpClient:true /UseBaseUrl:false /GenerateClientInterfaces:true" />
       <ExecPreprocessArgs Include="/RequiredPropertiesMustBeDefined:true /GenerateNullableReferenceTypes:true /GenerateImmutableArrayProperties:true /GenerateImmutableDictionaryProperties:true" />
-      <ExecPreprocessArgs Include="/ClassStyle:Record /TemplateDirectory:Templates /GenerateOptionalParameters:true /UseCancellationToken:true" />
+      <ExecPreprocessArgs Include="/ClassStyle:Record /TemplateDirectory:Templates /GenerateOptionalParameters:true" />
       <ExecPreprocessArgs Include="/OperationGenerationMode:MultipleClientsFromFirstTagAndPathSegments /JsonLibrary:SystemTextJson" />
     </ItemGroup>
 
@@ -26,7 +26,7 @@
     </ItemGroup>
 
     <Exec Command="dotnet new tool-manifest --force" />
-    <Exec Command="dotnet tool install --local NSwag.ConsoleCore --version 13.19.0" />
+    <Exec Command="dotnet tool install --local NSwag.ConsoleCore --version 14.0.0-preview009" />
     <Exec Command="dotnet nswag openapi2csclient @(ExecPreprocessArgs, ' ')" />
 
   </Target>
diff --git a/src/BUTR.Site.NexusMods.ServerClient/Clients.cs b/src/BUTR.Site.NexusMods.ServerClient/Clients.cs
index 89de244b..2f3ef88f 100644
--- a/src/BUTR.Site.NexusMods.ServerClient/Clients.cs
+++ b/src/BUTR.Site.NexusMods.ServerClient/Clients.cs
@@ -1,9 +1,12 @@
 using BUTR.Site.NexusMods.ServerClient.Utils;
 
 using System;
+using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -29,87 +32,85 @@ public CrashReportsClient(HttpClient client, JsonSerializerOptions options) : th
         _settings = new Lazy<JsonSerializerOptions>(options);
     }
 
-    protected virtual void OnPrepareRequest(HttpClient client, HttpRequestMessage request, System.Text.StringBuilder urlBuilder) { }
+    protected virtual void OnPrepareRequest(HttpClient client, HttpRequestMessage request, StringBuilder urlBuilder) { }
 
-    partial void PrepareRequest(HttpClient client, HttpRequestMessage request, System.Text.StringBuilder urlBuilder)
+    partial void PrepareRequest(HttpClient client, HttpRequestMessage request, StringBuilder urlBuilder)
     {
         OnPrepareRequest(client, request, urlBuilder);
     }
 
     public virtual async Task<PagingStreamingData<CrashReportModel2>> PaginatedStreamingAsync(PaginatedQuery? body = null, CancellationToken cancellationToken = default)
     {
-        var urlBuilder_ = new System.Text.StringBuilder();
+        var urlBuilder_ = new StringBuilder();
         urlBuilder_.Append("api/v1/CrashReports/PaginatedStreaming");
 
         var client_ = _httpClient;
         var disposeClient_ = false;
         try
         {
-            using (var request_ = new System.Net.Http.HttpRequestMessage())
-            {
-                var json_ = System.Text.Json.JsonSerializer.Serialize(body, _settings.Value);
-                var content_ = new System.Net.Http.StringContent(json_);
-                content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json");
-                request_.Content = content_;
-                request_.Method = new System.Net.Http.HttpMethod("POST");
-                request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/x-ndjson-butr-paging"));
+            using var request_ = new HttpRequestMessage();
+            request_.Content = JsonContent.Create(body, MediaTypeHeaderValue.Parse("application/json"), _settings.Value);
+            request_.Method = HttpMethod.Post;
+            request_.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/x-ndjson-butr-paging"));
 
-                PrepareRequest(client_, request_, urlBuilder_);
+            PrepareRequest(client_, request_, urlBuilder_);
 
-                var url_ = urlBuilder_.ToString();
-                request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute);
+            var url_ = urlBuilder_.ToString();
+            request_.RequestUri = new Uri(url_, UriKind.RelativeOrAbsolute);
 
-                PrepareRequest(client_, request_, url_);
+            PrepareRequest(client_, request_, url_);
 
-                var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-                var disposeResponse_ = false;
-                try
+            var response_ = await client_.SendAsync(request_, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
+            var disposeResponse_ = true;
+            try
+            {
+                var headers_ = System.Linq.Enumerable.ToDictionary(response_.Headers, h_ => h_.Key, h_ => h_.Value);
+                if (response_.Content is { Headers: not null })
                 {
-                    var headers_ = System.Linq.Enumerable.ToDictionary(response_.Headers, h_ => h_.Key, h_ => h_.Value);
-                    if (response_.Content != null && response_.Content.Headers != null)
-                    {
-                        foreach (var item_ in response_.Content.Headers)
-                            headers_[item_.Key] = item_.Value;
-                    }
+                    foreach (var item_ in response_.Content.Headers)
+                        headers_[item_.Key] = item_.Value;
+                }
 
-                    ProcessResponse(client_, response_);
+                ProcessResponse(client_, response_);
 
-                    var status_ = (int) response_.StatusCode;
-                    if (status_ == 200)
+                var status_ = (int) response_.StatusCode;
+                switch (response_.StatusCode)
+                {
+                    case HttpStatusCode.OK:
                     {
                         try
                         {
-                            return PagingStreamingData<CrashReportModel2>.Create(response_, JsonSerializerSettings, cancellationToken);
+                            var pagingStreamingData = PagingStreamingData<CrashReportModel2>.Create(response_, JsonSerializerSettings, cancellationToken);
+                            disposeResponse_ = false;
+                            return pagingStreamingData;
                         }
-                        catch (System.Text.Json.JsonException exception)
+                        catch (JsonException exception)
                         {
-                            var message = "Could not deserialize the response body stream as " + typeof(PagingStreamingData<CrashReportModel2>).FullName + ".";
+                            var message = $"Could not deserialize the response body stream as {typeof(PagingStreamingData<CrashReportModel2>).FullName}.";
                             throw new ApiException(message, (int) response_.StatusCode, string.Empty, headers_, exception);
                         }
                     }
-                    else
-                    if (status_ == 401)
+                    case HttpStatusCode.Unauthorized:
                     {
-                        string responseText_ = (response_.Content == null) ? string.Empty : await response_.Content.ReadAsStringAsync().ConfigureAwait(false);
+                        var responseText_ = response_.Content == null! ? string.Empty : await response_.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
                         throw new ApiException("User not authenticated.", status_, responseText_, headers_, null);
                     }
-                    else
-                    if (status_ == 403)
+                    case HttpStatusCode.Forbidden:
                     {
-                        string responseText_ = (response_.Content == null) ? string.Empty : await response_.Content.ReadAsStringAsync().ConfigureAwait(false);
+                        var responseText_ = response_.Content == null! ? string.Empty : await response_.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
                         throw new ApiException("User not authorized to access this endpoint.", status_, responseText_, headers_, null);
                     }
-                    else
+                    default:
                     {
-                        var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false);
-                        throw new ApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null);
+                        var responseData_ = response_.Content == null! ? null : await response_.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+                        throw new ApiException($"The HTTP status code of the response was not expected ({status_}).", status_, responseData_, headers_, null);
                     }
                 }
-                finally
-                {
-                    if (disposeResponse_)
-                        response_.Dispose();
-                }
+            }
+            finally
+            {
+                if (disposeResponse_)
+                    response_.Dispose();
             }
         }
         finally
diff --git a/src/BUTR.Site.NexusMods.ServerClient/Utils/PagingStreamingData.cs b/src/BUTR.Site.NexusMods.ServerClient/Utils/PagingStreamingData.cs
index abd7af25..5d3f1def 100644
--- a/src/BUTR.Site.NexusMods.ServerClient/Utils/PagingStreamingData.cs
+++ b/src/BUTR.Site.NexusMods.ServerClient/Utils/PagingStreamingData.cs
@@ -14,7 +14,7 @@ public sealed record PagingStreamingData<T> where T : class
 
     private static PagingStreamingData<T> Create()
     {
-        LazyTask<APIStreamingResponse> GetStatusAsync() => LazyTask<APIStreamingResponse>.FromResult(new APIStreamingResponse(string.Empty));
+        LazyTask<APIStreamingResponse> GetStatusAsync() => LazyTask<APIStreamingResponse>.FromResult(new APIStreamingResponse(null));
         LazyTask<PagingMetadata> GetMetadataAsync() => LazyTask<PagingMetadata>.FromResult(PagingMetadata.Empty);
         LazyTask<IAsyncEnumerable<T>> GetItemsAsync() => LazyTask<IAsyncEnumerable<T>>.FromResult(AsyncEnumerable.Empty<T>());
         LazyTask<PagingAdditionalMetadata> GetQueryExecutionTimeMilliseconds() => LazyTask<PagingAdditionalMetadata>.FromResult(PagingAdditionalMetadata.Empty);
@@ -30,7 +30,7 @@ private static PagingStreamingData<T> Create()
 
     public static PagingStreamingData<T> Create(PagingMetadata pagingMetadata, IAsyncEnumerable<T> items, PagingAdditionalMetadata additionalMetadata)
     {
-        LazyTask<APIStreamingResponse> GetStatusAsync() => LazyTask<APIStreamingResponse>.FromResult(new APIStreamingResponse(string.Empty));
+        LazyTask<APIStreamingResponse> GetStatusAsync() => LazyTask<APIStreamingResponse>.FromResult(new APIStreamingResponse(null));
         LazyTask<PagingMetadata> GetMetadataAsync() => LazyTask<PagingMetadata>.FromResult(pagingMetadata);
         LazyTask<IAsyncEnumerable<T>> GetItemsAsync() => LazyTask<IAsyncEnumerable<T>>.FromResult(items);
         LazyTask<PagingAdditionalMetadata> GetQueryExecutionTimeMillisecondsAsync() => LazyTask<PagingAdditionalMetadata>.FromResult(additionalMetadata);
@@ -58,7 +58,7 @@ async LazyTask<APIStreamingResponse> GetStatusAsync()
         {
             var stream = await streamingJsonContext.ReadLfSeparatedJsonAsync(ct);
             var result = await JsonSerializer.DeserializeAsync<APIStreamingResponse>(stream, jsonSerializerOptions, ct);
-            hasError = result is null || !string.IsNullOrEmpty(result.HumanReadableError);
+            hasError = result is null || !string.IsNullOrEmpty(result.Error?.Detail);
             return result!;
         }
         async LazyTask<PagingMetadata> GetMetadataAsync()
diff --git a/src/BUTR.Site.NexusMods.Shared/BUTR.Site.NexusMods.Shared.csproj b/src/BUTR.Site.NexusMods.Shared/BUTR.Site.NexusMods.Shared.csproj
index db15dea7..35e991b0 100644
--- a/src/BUTR.Site.NexusMods.Shared/BUTR.Site.NexusMods.Shared.csproj
+++ b/src/BUTR.Site.NexusMods.Shared/BUTR.Site.NexusMods.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
diff --git a/src/BUTR.Site.NexusMods.Shared/Helpers/TenantUtils.cs b/src/BUTR.Site.NexusMods.Shared/Helpers/TenantUtils.cs
index e00f288b..72f01570 100644
--- a/src/BUTR.Site.NexusMods.Shared/Helpers/TenantUtils.cs
+++ b/src/BUTR.Site.NexusMods.Shared/Helpers/TenantUtils.cs
@@ -6,19 +6,19 @@ namespace BUTR.Site.NexusMods.Shared.Helpers;
 public static class TenantUtils
 {
     public const string Bannerlord = "Bannerlord";
-    public const string BannerlordId = "1";
+    public const int BannerlordId = 1;
     public const string BannerlordName = "Mount & Blade II: Bannerlord";
     public const string BannerlordGameDomain = "mountandblade2bannerlord";
     public const string Rimworld = "Rimworld";
-    public const string RimworldId = "2";
+    public const int RimworldId = 2;
     public const string RimworldName = "Rimworld";
     public const string RimworldGameDomain = "rimworld";
     public const string StardewValley = "StardewValley";
-    public const string StardewValleyId = "3";
+    public const int StardewValleyId = 3;
     public const string StardewValleyName = "Stardew Valley";
     public const string StardewValleyGameDomain = "stardewvalley";
 
-    private sealed record TenantMetadata(string Id, string NexusModsId, string Name);
+    private sealed record TenantMetadata(int Id, string NexusModsId, string Name);
 
     private static readonly List<TenantMetadata> TenantMetadatas = new()
     {
@@ -27,7 +27,7 @@ private sealed record TenantMetadata(string Id, string NexusModsId, string Name)
         new(StardewValleyId, StardewValleyGameDomain, StardewValleyName),
     };
 
-    public static string? FromGameDomainToTenant(string gameDomain) => TenantMetadatas.FirstOrDefault(x => x.NexusModsId == gameDomain)?.Id;
-    public static string? FromTenantToGameDomain(string tenant) => TenantMetadatas.FirstOrDefault(x => x.Id == tenant)?.NexusModsId;
-    public static string? FromTenantToName(string tenant) => TenantMetadatas.FirstOrDefault(x => x.Id == tenant)?.Name;
+    public static int? FromGameDomainToTenant(string gameDomain) => TenantMetadatas.FirstOrDefault(x => x.NexusModsId == gameDomain)?.Id;
+    public static string? FromTenantToGameDomain(int tenant) => TenantMetadatas.FirstOrDefault(x => x.Id == tenant)?.NexusModsId;
+    public static string? FromTenantToName(int tenant) => TenantMetadatas.FirstOrDefault(x => x.Id == tenant)?.Name;
 }
\ No newline at end of file
diff --git a/src/nuget.config b/src/nuget.config
index eb3fc3b2..fb3f59b9 100644
--- a/src/nuget.config
+++ b/src/nuget.config
@@ -4,6 +4,7 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="butr.github" value="https://nuget.pkg.github.com/BUTR/index.json" />
+    <add key="npgsql" value="https://www.myget.org/F/npgsql-vnext/api/v3/index.json" />
   </packageSources>
   <packageSourceCredentials>
     <butr.github>