From d048fa8ee36105a3f0e7dcb13f6396d25b3d9099 Mon Sep 17 00:00:00 2001
From: Vitalii Mikhailov <personal@aragas.org>
Date: Fri, 24 Nov 2023 23:57:15 +0200
Subject: [PATCH] Many changes

Fixed readonly access
Migrated to release .NET 8
Split Vogen into separate project
Added TransparentValueObjects as an alternative - WIP
Fixed ServiceProvider Too Many warning, thanks Npgsql
---
 build/common.props                            |   2 +-
 .../BUTR.Site.NexusMods.Client.csproj         |  32 ++---
 ...e.NexusMods.Server.ValueObjects.TVO.csproj |  20 +++
 ...Server.ValueObjects.TVO.csproj.DotSettings |   3 +
 .../Extensions/OpenApiExtensions.cs           |   9 ++
 .../Models/ApplicationRole.cs                 |  21 ++++
 .../Models/CrashReportFileId.cs               |  16 +++
 .../Models/CrashReportId.cs                   |  18 +++
 .../Models/CrashReportUrl.cs                  |  18 +++
 .../Models/CrashReportVersion.cs              |  16 +++
 .../Models/ExceptionTypeId.cs                 |  16 +++
 .../Models/GameVersion.cs                     |  16 +++
 .../Models/IValueObjectFrom.cs                |   9 ++
 .../Models/ModuleId.cs                        |  16 +++
 .../Models/ModuleVersion.cs                   |  16 +++
 .../Models/NexusModsApiKey.cs                 |  19 +++
 .../Models/NexusModsArticleId.cs              |  41 +++++++
 .../Models/NexusModsFileId.cs                 |  16 +++
 .../Models/NexusModsGameDomain.cs             |  61 +++++++++
 .../Models/NexusModsModId.cs                  |  43 +++++++
 .../Models/NexusModsUserEMail.cs              |  18 +++
 .../Models/NexusModsUserId.cs                 |  43 +++++++
 .../Models/NexusModsUserName.cs               |  18 +++
 .../Models/TenantId.cs                        |  49 ++++++++
 .../Usings.cs                                 |  20 +++
 .../TransparentValueObjectSchemaFilter.cs     |  16 +++
 .../TransparentValueObjectTypeConverter.cs    |  19 +++
 .../Utils/_CopyHelper.cs}                     |   4 +-
 .../Utils/_QueryableHelper.cs                 |  15 +++
 ...NexusMods.Server.ValueObjects.Vogen.csproj |  20 +++
 ...rver.ValueObjects.Vogen.csproj.DotSettings |   3 +
 .../Extensions/EfCoreExtensions.cs            |  73 +++++++++++
 .../Extensions/OpenApiExtensions.cs           |   9 ++
 .../Models}/ApplicationRole.cs                |  22 ++--
 .../Models}/CrashReportFileId.cs              |   9 --
 .../Models}/CrashReportId.cs                  |   9 --
 .../Models}/CrashReportUrl.cs                 |   9 --
 .../Models}/CrashReportVersion.cs             |   9 --
 .../Models}/ExceptionTypeId.cs                |   9 --
 .../Models}/GameVersion.cs                    |   8 --
 .../Models}/ModuleId.cs                       |   9 --
 .../Models}/ModuleVersion.cs                  |   9 --
 .../Models}/NexusModsApiKey.cs                |  15 +--
 .../Models}/NexusModsArticleId.cs             |  15 +--
 .../Models}/NexusModsFileId.cs                |   9 --
 .../Models}/NexusModsGameDomain.cs            |  26 ++--
 .../Models}/NexusModsModId.cs                 |  15 +--
 .../Models}/NexusModsUserEMail.cs             |  15 +--
 .../Models}/NexusModsUserId.cs                |  15 +--
 .../Models}/NexusModsUserName.cs              |  15 +--
 .../Models}/TenantId.cs                       |  26 ++--
 .../Usings.cs                                 |  20 +++
 .../Utils}/IHasCopy.cs                        |   2 +-
 .../Utils}/IHasDefaultValue.cs                |   2 +-
 .../Utils}/IHasDeserialize.cs                 |   2 +-
 .../Utils}/IHasIsInitialized.cs               |   2 +-
 .../Utils}/IHasRandomValueGenerator.cs        |   4 +-
 .../Utils/IVogen.cs                           |  27 ++++
 .../Utils/IVogenParsable.cs                   |   9 ++
 .../Utils/IVogenSpanParsable.cs               |   9 ++
 .../Utils/IVogenUtf8SpanParsable.cs           |   9 ++
 .../Utils}/VogenDefaults.cs                   |   5 +-
 .../Utils}/VogenDefaultsParsable.cs           |   5 +-
 .../VogenDefaultsRandomValueGenerator.cs      |   6 +-
 .../Utils}/VogenDefaultsSpanParsable.cs       |   5 +-
 .../Utils}/VogenDefaultsUtf8SpanParsable.cs   |   5 +-
 .../Utils}/VogenJsonConverter.cs              |   6 +-
 .../Utils}/VogenSchemaFilter.cs               |   8 +-
 .../Utils}/VogenTypeConverter.cs              |   6 +-
 .../Utils}/VogenValueComparer.cs              |   9 +-
 .../Utils}/VogenValueComparerReference.cs     |   9 +-
 .../Utils}/VogenValueConverter.cs             |   8 +-
 .../Utils/_CopyHelper.cs                      |  26 ++++
 .../Utils/_QueryableHelper.cs                 |  15 +++
 .../BUTR.Site.NexusMods.Server.csproj         |  42 +++----
 ...R.Site.NexusMods.Server.csproj.DotSettings |   4 +
 .../Contexts/AppDbContextRead.cs              |  36 ++----
 .../Contexts/AppDbContextWrite.cs             |  23 +---
 .../Contexts/BaseAppDbContext.cs              | 116 ++++++++----------
 .../Configs/BaseEntityConfiguration.cs        |   2 +-
 .../BaseEntityConfigurationWithTenant.cs      |   4 +-
 .../Configs/CrashReportEntityConfiguration.cs |  11 +-
 ...hReportIgnoredFileIdEntityConfiguration.cs |   4 +-
 .../CrashReportToFileIdEntityConfiguration.cs |   6 +-
 ...rashReportToMetadataEntityConfiguration.cs |   4 +-
 ...portToModuleMetadataEntityConfiguration.cs |   9 +-
 .../ExceptionTypeEntityConfiguration.cs       |   4 +-
 .../Contexts/Configs/IEntityConfiguration.cs  |   3 +
 ...grationDiscordTokensEntityConfiguration.cs |   3 +-
 ...tionGOGToOwnedTenantEntityConfiguration.cs |   4 +-
 ...IntegrationGOGTokensEntityConfiguration.cs |   3 +-
 ...onSteamToOwnedTenantEntityConfiguration.cs |   4 +-
 ...tegrationSteamTokensEntityConfiguration.cs |   3 +-
 .../Configs/ModuleEntityConfiguration.cs      |   4 +-
 .../NexusModsArticleEntityConfiguration.cs    |   5 +-
 .../NexusModsModEntityConfiguration.cs        |   4 +-
 ...sModsModToFileUpdateEntityConfiguration.cs |   3 +-
 ...NexusModsModToModuleEntityConfiguration.cs |   5 +-
 ...dToModuleInfoHistoryEntityConfiguration.cs |   9 +-
 .../NexusModsModToNameEntityConfiguration.cs  |   3 +-
 .../NexusModsUserEntityConfiguration.cs       |   4 +-
 ...odsUserToCrashReportEntityConfiguration.cs |   5 +-
 ...ToIntegrationDiscordEntityConfiguration.cs |   3 +-
 ...UserToIntegrationGOGEntityConfiguration.cs |   3 +-
 ...erToIntegrationSteamEntityConfiguration.cs |   3 +-
 ...exusModsUserToModuleEntityConfiguration.cs |   5 +-
 .../NexusModsUserToNameEntityConfiguration.cs |   5 +-
 ...dsUserToNexusModsModEntityConfiguration.cs |   5 +-
 .../NexusModsUserToRoleEntityConfiguration.cs |   7 +-
 ...csCrashScoreInvolvedEntityConfiguration.cs |   7 +-
 ...icsTopExceptionsTypeEntityConfiguration.cs |   3 +-
 .../Configs/TenantEntityConfiguration.cs      |   4 +-
 .../Contexts/EntityConfigurationFactory.cs    |  14 +--
 .../Contexts/NpgsqlDataSourceProvider.cs      |  50 ++++++++
 .../CrashReportsAnalyzerController.cs         |   9 +-
 .../Controllers/CrashReportsController.cs     |   2 -
 .../Controllers/DiscordController.cs          |   2 -
 .../Controllers/ExposedModsController.cs      |   3 -
 .../Controllers/GOGController.cs              |   2 -
 .../GamePublicApiDiffController.cs            |   1 -
 .../Controllers/GameSourceDiffController.cs   |   3 -
 .../Controllers/NexusModsArticleController.cs |   3 -
 .../Controllers/NexusModsModController.cs     |   2 -
 .../Controllers/NexusModsUserController.cs    |   2 -
 .../Controllers/QuartzController.cs           |   2 -
 .../Controllers/ReportsController.cs          |   1 -
 .../Controllers/StatisticsController.cs       |   3 -
 .../Controllers/SteamController.cs            |   2 -
 .../DynamicFilterBuilder.cs                   |   5 +-
 .../Extensions/IAsyncEnumerableExtensions.cs  |   4 +-
 .../JobExecutionContextExtensions.cs          |   1 -
 .../Extensions/QueryableExtensions.cs         |   8 +-
 .../Extensions/VogenExtensions.cs             |  80 ------------
 .../Models/API/PagingData.cs                  |   2 +-
 .../Options/NexusModsOptions.cs               |   2 +-
 .../Services/CrashReportBatchedHandler.cs     |  16 +--
 .../HttpClients/NexusModsAPIClient.cs         |   2 +-
 ...lordBinaryCache.cs => SteamBinaryCache.cs} |   4 +-
 src/BUTR.Site.NexusMods.Server/Startup.cs     |  30 ++---
 .../Utils/BindingSources/IBindIgnore.cs       |   2 +-
 .../Utils/BlockUntilDateConstraint.cs         |   6 +-
 .../Logging/SyncLoggingHttpMessageHandler.cs  |   8 +-
 .../SyncLoggingScopeHttpMessageHandler.cs     |   8 +-
 .../Npgsql/ImmutableArrayToArrayConverter.cs  |  18 ---
 .../Utils/Vogen/IVogen.cs                     |  58 ---------
 .../Clients.cs                                |  14 +--
 .../Utils/OneTimeEnumerable.cs                |   2 +-
 .../Utils/PagingStreamingData.cs              |   6 +-
 .../Utils/StreamWithLfEnding.cs               |   6 +-
 ...R.Site.NexusMods.Shared.csproj.DotSettings |   2 +
 .../Helpers/NexusModsUtils.cs                 |   5 +-
 src/nuget.config                              |   1 -
 152 files changed, 1164 insertions(+), 757 deletions(-)
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/BUTR.Site.NexusMods.Server.ValueObjects.TVO.csproj
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/BUTR.Site.NexusMods.Server.ValueObjects.TVO.csproj.DotSettings
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Extensions/OpenApiExtensions.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ApplicationRole.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportFileId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportUrl.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportVersion.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ExceptionTypeId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/GameVersion.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/IValueObjectFrom.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ModuleId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ModuleVersion.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsApiKey.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsArticleId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsFileId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsGameDomain.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsModId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserEMail.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserName.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/TenantId.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Usings.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/TransparentValueObjectSchemaFilter.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/TransparentValueObjectTypeConverter.cs
 rename src/{BUTR.Site.NexusMods.Server/Utils/CopyHelper.cs => BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/_CopyHelper.cs} (92%)
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/_QueryableHelper.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj.DotSettings
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Extensions/EfCoreExtensions.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Extensions/OpenApiExtensions.cs
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/ApplicationRole.cs (74%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/CrashReportFileId.cs (86%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/CrashReportId.cs (87%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/CrashReportUrl.cs (86%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/CrashReportVersion.cs (87%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/ExceptionTypeId.cs (86%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/GameVersion.cs (87%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/ModuleId.cs (86%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/ModuleVersion.cs (86%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/NexusModsApiKey.cs (82%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/NexusModsArticleId.cs (87%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/NexusModsFileId.cs (87%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/NexusModsGameDomain.cs (84%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/NexusModsModId.cs (89%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/NexusModsUserEMail.cs (85%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/NexusModsUserId.cs (90%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/NexusModsUserName.cs (85%)
 rename src/{BUTR.Site.NexusMods.Server/Models/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models}/TenantId.cs (83%)
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Usings.cs
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/IHasCopy.cs (60%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/IHasDefaultValue.cs (65%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/IHasDeserialize.cs (70%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/IHasIsInitialized.cs (65%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/IHasRandomValueGenerator.cs (79%)
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogen.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenParsable.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenSpanParsable.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenUtf8SpanParsable.cs
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenDefaults.cs (94%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenDefaultsParsable.cs (88%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenDefaultsRandomValueGenerator.cs (80%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenDefaultsSpanParsable.cs (89%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenDefaultsUtf8SpanParsable.cs (89%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenJsonConverter.cs (90%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenSchemaFilter.cs (81%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenTypeConverter.cs (90%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenValueComparer.cs (74%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenValueComparerReference.cs (67%)
 rename src/{BUTR.Site.NexusMods.Server/Utils/Vogen => BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils}/VogenValueConverter.cs (68%)
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/_CopyHelper.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/_QueryableHelper.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server/Contexts/Configs/IEntityConfiguration.cs
 create mode 100644 src/BUTR.Site.NexusMods.Server/Contexts/NpgsqlDataSourceProvider.cs
 delete mode 100644 src/BUTR.Site.NexusMods.Server/Extensions/VogenExtensions.cs
 rename src/BUTR.Site.NexusMods.Server/Services/{BannerlordBinaryCache.cs => SteamBinaryCache.cs} (87%)
 delete mode 100644 src/BUTR.Site.NexusMods.Server/Utils/Npgsql/ImmutableArrayToArrayConverter.cs
 delete mode 100644 src/BUTR.Site.NexusMods.Server/Utils/Vogen/IVogen.cs
 create mode 100644 src/BUTR.Site.NexusMods.Shared/BUTR.Site.NexusMods.Shared.csproj.DotSettings

diff --git a/build/common.props b/build/common.props
index ebea4915..362b5285 100644
--- a/build/common.props
+++ b/build/common.props
@@ -16,7 +16,7 @@
   </PropertyGroup>
   <!--SorceLink-->
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     <PackageReference Include="GitVersion.MsBuild" Version="5.12.0" PrivateAssets="all" />
   </ItemGroup>
 
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 266b0139..55d9ad2d 100644
--- a/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj
+++ b/src/BUTR.Site.NexusMods.Client/BUTR.Site.NexusMods.Client.csproj
@@ -17,26 +17,26 @@
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
-    <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.LoadingIndicator" Version="1.3.2" />
-    <PackageReference Include="Blazorise.QRCode" Version="1.3.2" />
-    <PackageReference Include="Blazorise.Snackbar" Version="1.3.2" />
-    <PackageReference Include="Blazorise.TreeView" Version="1.3.2" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.3.3" />
+    <PackageReference Include="Blazorise.Charts" Version="1.3.3" />
+    <PackageReference Include="Blazorise.Components" Version="1.3.3" />
+    <PackageReference Include="Blazorise.DataGrid" Version="1.3.3" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.3" />
+    <PackageReference Include="Blazorise.LoadingIndicator" Version="1.3.3" />
+    <PackageReference Include="Blazorise.QRCode" Version="1.3.3" />
+    <PackageReference Include="Blazorise.Snackbar" Version="1.3.3" />
+    <PackageReference Include="Blazorise.TreeView" Version="1.3.3" />
     <PackageReference Include="BUTR.CrashReport.Models" Version="13.0.0.32" />
     <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.32" />
     <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <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="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="Mono.Cecil" Version="0.11.5" />
-    <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" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>
 
   <!--
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/BUTR.Site.NexusMods.Server.ValueObjects.TVO.csproj b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/BUTR.Site.NexusMods.Server.ValueObjects.TVO.csproj
new file mode 100644
index 00000000..a569244c
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/BUTR.Site.NexusMods.Server.ValueObjects.TVO.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <RootNamespace>BUTR.Site.NexusMods.Server.Models</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
+    <PackageReference Include="TransparentValueObjects" Version="1.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BUTR.Site.NexusMods.Shared\BUTR.Site.NexusMods.Shared.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/BUTR.Site.NexusMods.Server.ValueObjects.TVO.csproj.DotSettings b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/BUTR.Site.NexusMods.Server.ValueObjects.TVO.csproj.DotSettings
new file mode 100644
index 00000000..86990bd5
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/BUTR.Site.NexusMods.Server.ValueObjects.TVO.csproj.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=utils/@EntryIndexedValue">False</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Extensions/OpenApiExtensions.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Extensions/OpenApiExtensions.cs
new file mode 100644
index 00000000..6a193c27
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Extensions/OpenApiExtensions.cs
@@ -0,0 +1,9 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+public static class OpenApiExtensions
+{
+    public static void ValueObjectFilter(this SwaggerGenOptions opt)
+    {
+        opt.SchemaFilter<TransparentValueObjectSchemaFilter>();
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ApplicationRole.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ApplicationRole.cs
new file mode 100644
index 00000000..371f2881
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ApplicationRole.cs
@@ -0,0 +1,21 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = ApplicationRole;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct ApplicationRole : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static readonly TType Anonymous = From(ApplicationRoles.Anonymous);
+    public static readonly TType User = From(ApplicationRoles.User);
+    public static readonly TType Moderator = From(ApplicationRoles.Moderator);
+    public static readonly TType Administrator = From(ApplicationRoles.Administrator);
+    
+    public static TType DefaultValue => Anonymous;
+}
+
+public static class ApplicationRoleExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportFileId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportFileId.cs
new file mode 100644
index 00000000..6c2d9347
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportFileId.cs
@@ -0,0 +1,16 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = CrashReportFileId;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct CrashReportFileId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(string.Empty);
+}
+
+public static class CrashReportFileIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportId.cs
new file mode 100644
index 00000000..5539593c
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportId.cs
@@ -0,0 +1,18 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = CrashReportId;
+using TValueType = Guid;
+
+[ValueObject<TValueType>]
+public readonly partial struct CrashReportId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(Guid.Empty);
+    
+    public static TType NewRandomValue(Random? random) => From(Guid.NewGuid());
+}
+
+public static class CrashReportIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportUrl.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportUrl.cs
new file mode 100644
index 00000000..9ef531dc
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportUrl.cs
@@ -0,0 +1,18 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = CrashReportUrl;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct CrashReportUrl : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(string.Empty);
+    
+    public static TType From(Uri uri) => From(uri.ToString());
+}
+
+public static class CrashReportUrlExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportVersion.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportVersion.cs
new file mode 100644
index 00000000..5a1e6c25
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/CrashReportVersion.cs
@@ -0,0 +1,16 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = CrashReportVersion;
+using TValueType = Byte;
+
+[ValueObject<TValueType>]
+public readonly partial struct CrashReportVersion : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(0);
+}
+
+public static class CrashReportVersionExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ExceptionTypeId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ExceptionTypeId.cs
new file mode 100644
index 00000000..589971c5
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ExceptionTypeId.cs
@@ -0,0 +1,16 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = ExceptionTypeId;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct ExceptionTypeId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(string.Empty);
+}
+
+public static class ExceptionTypeIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/GameVersion.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/GameVersion.cs
new file mode 100644
index 00000000..3257a0c8
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/GameVersion.cs
@@ -0,0 +1,16 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = GameVersion;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct GameVersion : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(string.Empty);
+}
+
+public static class GameVersionExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/IValueObjectFrom.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/IValueObjectFrom.cs
new file mode 100644
index 00000000..665ddc36
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/IValueObjectFrom.cs
@@ -0,0 +1,9 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+internal interface IValueObjectFrom<TValueType, TInnerValue>
+    where TValueType : IValueObjectFrom<TValueType, TInnerValue>
+{
+    static abstract explicit operator TValueType(TInnerValue value);
+    static abstract explicit operator TInnerValue(TValueType value);
+    static abstract TValueType From(TInnerValue value);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ModuleId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ModuleId.cs
new file mode 100644
index 00000000..1cf34295
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ModuleId.cs
@@ -0,0 +1,16 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = ModuleId;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct ModuleId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(string.Empty);
+}
+
+public static class ModuleIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ModuleVersion.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ModuleVersion.cs
new file mode 100644
index 00000000..4ba24e95
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/ModuleVersion.cs
@@ -0,0 +1,16 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = ModuleVersion;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct ModuleVersion : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(string.Empty);
+}
+
+public static class ModuleVersionExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsApiKey.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsApiKey.cs
new file mode 100644
index 00000000..04e18440
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsApiKey.cs
@@ -0,0 +1,19 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = NexusModsApiKey;
+using TValueType = String;
+
+[TypeConverter(type: typeof(TransparentValueObjectTypeConverter<TType, TValueType>))]
+[ValueObject<TValueType>]
+public readonly partial struct NexusModsApiKey : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>, IValueObjectFrom<TType, TValueType>
+{
+    public static readonly TType None = From(string.Empty);
+    
+    public static TType DefaultValue => None;
+}
+
+public static class NexusModsApiKeyExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsArticleId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsArticleId.cs
new file mode 100644
index 00000000..7e922a66
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsArticleId.cs
@@ -0,0 +1,41 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = NexusModsArticleId;
+using TValueType = Int32;
+
+[ValueObject<TValueType>]
+public readonly partial struct NexusModsArticleId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static readonly TType None = From(0);
+
+    public static TType DefaultValue => None;
+
+    public static bool TryParse(string articleIdRaw, out TType articleId)
+    {
+        var result = TValueType.TryParse(articleIdRaw, out var articleIdVal);
+        articleId = result ? From(articleIdVal) : DefaultValue;
+        return result;
+    }
+    
+    public static bool TryParseUrl(string? urlRaw, out TType articleId)
+    {
+        articleId = From(0);
+
+        if (!Uri.TryCreate(urlRaw, UriKind.Absolute, out var url))
+            return false;
+
+        if (!url.Host.EndsWith("nexusmods.com"))
+            return false;
+
+        if (url.LocalPath.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) is not [_, _, var articleIdRaw, ..])
+            return false;
+
+        return TryParse(articleIdRaw, out articleId);
+    }
+}
+
+public static class NexusModsArticleIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsFileId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsFileId.cs
new file mode 100644
index 00000000..c3dbef56
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsFileId.cs
@@ -0,0 +1,16 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = NexusModsFileId;
+using TValueType = Int32;
+
+[ValueObject<TValueType>]
+public readonly partial struct NexusModsFileId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static TType DefaultValue => From(0);
+}
+
+public static class NexusModsFileIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsGameDomain.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsGameDomain.cs
new file mode 100644
index 00000000..3dce0b4e
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsGameDomain.cs
@@ -0,0 +1,61 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = NexusModsGameDomain;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct NexusModsGameDomain : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static readonly TType None = From(string.Empty);
+    public static readonly TType Bannerlord = From(TenantUtils.BannerlordGameDomain);
+    public static readonly TType Rimworld = From(TenantUtils.RimworldGameDomain);
+    public static readonly TType StardewValley = From(TenantUtils.StardewValleyGameDomain);
+    
+    public static TType DefaultValue => None;
+
+    public static IEnumerable<TType> Values
+    {
+        get
+        {
+            yield return Bannerlord;
+            yield return Rimworld;
+            yield return StardewValley;
+        }
+    }
+
+    public static bool TryParse(string urlRaw, out TType gameDomain)
+    {
+        gameDomain = DefaultValue;
+
+        if (!Uri.TryCreate(urlRaw, UriKind.Absolute, out var url))
+            return false;
+
+        if (!url.Host.EndsWith("nexusmods.com"))
+            return false;
+
+        if (url.LocalPath.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) is not [var gameDomainStr, ..])
+            return false;
+
+        gameDomain = From(gameDomainStr);
+        return true;
+    }
+
+    public static TType FromGameDomain(string gameDomain)
+    {
+        foreach (var nexusModsGameDomain in Values)
+        {
+            if (nexusModsGameDomain.Value == gameDomain)
+                return nexusModsGameDomain;
+        }
+
+        return None;
+    }
+
+    public TenantId ToTenant() => TenantUtils.FromGameDomainToTenant(Value) is { } tenantRaw ? TenantId.FromTenant(tenantRaw) : TenantId.None;
+}
+
+public static class NexusModsGameDomainExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsModId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsModId.cs
new file mode 100644
index 00000000..87d8f65a
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsModId.cs
@@ -0,0 +1,43 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = NexusModsModId;
+using TValueType = Int32;
+
+[ValueObject<TValueType>]
+public readonly partial struct NexusModsModId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static readonly TType None = From(0);
+    public static TType DefaultValue => None;
+
+    public static bool TryParse(string modIdRaw, out TType modId)
+    {
+        var result = TValueType.TryParse(modIdRaw, out var modIdVal);
+        modId = result ? From(modIdVal) : DefaultValue;
+        return result;
+    }
+    
+    public static bool TryParseUrl(string? urlRaw, out TType modId)
+    {
+        modId = DefaultValue;
+
+        if (!Uri.TryCreate(urlRaw, UriKind.Absolute, out var url))
+            return false;
+
+        if (!url.Host.EndsWith("nexusmods.com"))
+            return false;
+
+        if (url.LocalPath.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) is not [_, _, var modIdRaw, ..])
+            return false;
+
+        return TryParse(modIdRaw, out modId);
+    }
+}
+
+public static class NexusModsModIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+
+    public static PropertyBuilder<TType?> HasValueObjectConversion(this PropertyBuilder<TType?> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserEMail.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserEMail.cs
new file mode 100644
index 00000000..73f82032
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserEMail.cs
@@ -0,0 +1,18 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = NexusModsUserEMail;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct NexusModsUserEMail : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static readonly TType Empty = From(string.Empty);
+    
+    public static TType DefaultValue => Empty;
+}
+
+public static class NexusModsUserEMailExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserId.cs
new file mode 100644
index 00000000..1ffec74d
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserId.cs
@@ -0,0 +1,43 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = NexusModsUserId;
+using TValueType = Int32;
+
+[ValueObject<TValueType>]
+public readonly partial struct NexusModsUserId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static readonly TType None = From(0);
+    
+    public static TType DefaultValue => None;
+
+    public static bool TryParse(string userIdRaw, out TType userId)
+    {
+        var result = TValueType.TryParse(userIdRaw, out var userIdVal);
+        userId = result ? From(userIdVal) : DefaultValue;
+        return result;
+    }
+    
+    public static bool TryParseUrl(string? urlRaw, out TType userId)
+    {
+        userId = DefaultValue;
+
+        if (!Uri.TryCreate(urlRaw, UriKind.Absolute, out var url))
+            return false;
+
+        if (!url.Host.EndsWith("nexusmods.com"))
+            return false;
+
+        if (url.LocalPath.Split('/', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) is not [_, _, var userIdRaw, ..])
+            return false;
+
+        return TryParse(userIdRaw, out userId);
+    }
+
+    public static TType From(uint id) => From((TValueType) id);
+}
+
+public static class NexusModsUserIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserName.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserName.cs
new file mode 100644
index 00000000..22229f3c
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/NexusModsUserName.cs
@@ -0,0 +1,18 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = NexusModsUserName;
+using TValueType = String;
+
+[ValueObject<TValueType>]
+public readonly partial struct NexusModsUserName : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>
+{
+    public static readonly TType Empty = From(string.Empty);
+    
+    public static TType DefaultValue => Empty;
+}
+
+public static class NexusModsUserNameExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/TenantId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/TenantId.cs
new file mode 100644
index 00000000..ca8b7996
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Models/TenantId.cs
@@ -0,0 +1,49 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+using TType = TenantId;
+using TValueType = Byte;
+
+[TypeConverter(type: typeof(TransparentValueObjectTypeConverter<TType, TValueType>))]
+[ValueObject<TValueType>]
+public readonly partial struct TenantId : IAugmentWith<DefaultValueAugment, JsonAugment, EfCoreAugment>, IValueObjectFrom<TType, TValueType>
+{
+    public static readonly TType None = From(0);
+    public static readonly TType Bannerlord = From(TenantUtils.BannerlordId);
+    public static readonly TType Rimworld = From(TenantUtils.RimworldId);
+    public static readonly TType StardewValley = From(TenantUtils.StardewValleyId);
+    
+    public static TType DefaultValue => None;
+
+    public static IEnumerable<TType> Values
+    {
+        get
+        {
+            yield return Bannerlord;
+            //yield return Rimworld;
+            //yield return StardewValley;
+            //yield return DarkestDungeon;
+        }
+    }
+
+    public static TType FromTenant(int tenant)
+    {
+        foreach (var tenantId in Values)
+        {
+            if (tenantId.Value == tenant)
+                return tenantId;
+        }
+
+        return None;
+    }
+
+    public NexusModsGameDomain ToGameDomain() =>
+        TenantUtils.FromTenantToGameDomain(Value) is { } gameDomainRaw ? NexusModsGameDomain.FromGameDomain(gameDomainRaw) : NexusModsGameDomain.None;
+
+    public string ToName() => TenantUtils.FromTenantToName(Value) ?? string.Empty;
+}
+
+public static class TenantIdExtension
+{
+    public static PropertyBuilder<TType> HasValueObjectConversion(this PropertyBuilder<TType> propertyBuilder) => propertyBuilder
+        .HasConversion<TType.EfCoreValueConverter, TType.EfCoreValueComparer>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Usings.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Usings.cs
new file mode 100644
index 00000000..fbe83907
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Usings.cs
@@ -0,0 +1,20 @@
+global using BUTR.Site.NexusMods.Shared.Helpers;
+global using BUTR.Site.NexusMods.Server.Models;
+global using BUTR.Site.NexusMods.Server.ValueObjects.Utils;
+global using BUTR.Site.NexusMods.Server.Utils;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.EntityFrameworkCore.ChangeTracking;
+global using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+global using Microsoft.EntityFrameworkCore.Metadata.Builders;
+global using Microsoft.OpenApi.Models;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Runtime.CompilerServices;
+global using System.Runtime.InteropServices;
+global using System.Text.Json;
+global using System.Text.Json.Serialization;
+global using System.ComponentModel;
+global using System.Globalization;
+global using System.Reflection;
+global using Swashbuckle.AspNetCore.SwaggerGen;
+global using TransparentValueObjects;
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/TransparentValueObjectSchemaFilter.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/TransparentValueObjectSchemaFilter.cs
new file mode 100644
index 00000000..e795eeb2
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/TransparentValueObjectSchemaFilter.cs
@@ -0,0 +1,16 @@
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
+
+public sealed class TransparentValueObjectSchemaFilter : ISchemaFilter
+{
+    public void Apply(OpenApiSchema schema, SchemaFilterContext context)
+    {
+        if (context.Type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IValueObject<>)) 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.ValueObjects.TVO/Utils/TransparentValueObjectTypeConverter.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/TransparentValueObjectTypeConverter.cs
new file mode 100644
index 00000000..521f59fa
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/TransparentValueObjectTypeConverter.cs
@@ -0,0 +1,19 @@
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
+
+internal class TransparentValueObjectTypeConverter<TValueType, TInnerValue> : TypeConverter
+    where TValueType : struct, IValueObjectFrom<TValueType, TInnerValue>
+    where TInnerValue : notnull
+{
+    public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
+        sourceType == typeof(TInnerValue) || base.CanConvertFrom(context, sourceType);
+
+    public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) =>
+        value is TInnerValue valValue ? TValueType.From(valValue) : base.ConvertFrom(context, culture, value);
+
+    public override bool CanConvertTo(ITypeDescriptorContext? context, Type? sourceType) =>
+        sourceType == typeof(TValueType) || base.CanConvertTo(context, sourceType);
+
+    public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType) => value is TValueType idValue
+        ? destinationType == typeof(TInnerValue) ? (TInnerValue) 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/CopyHelper.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/_CopyHelper.cs
similarity index 92%
rename from src/BUTR.Site.NexusMods.Server/Utils/CopyHelper.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/_CopyHelper.cs
index 56b7082a..6cd40028 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/CopyHelper.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/_CopyHelper.cs
@@ -1,8 +1,6 @@
-using System.Reflection;
-
 namespace BUTR.Site.NexusMods.Server.Utils;
 
-internal static class CopyHelper
+public static class CopyHelper
 {
     public static T CopyPublicProperties<T>(T oldObject, T newObject) where T : class
     {
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/_QueryableHelper.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/_QueryableHelper.cs
new file mode 100644
index 00000000..649571ac
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.TVO/Utils/_QueryableHelper.cs
@@ -0,0 +1,15 @@
+namespace BUTR.Site.NexusMods.Server.Utils;
+
+public static class QueryableHelper
+{
+    public static Type ConvertValueObject(Type type)
+    {
+        if (type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IValueObject<>)) is { } vogen)
+        {
+            if (vogen.GetGenericArguments() is [{ } valueObject])
+                type = valueObject;
+        }
+
+        return type;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj
new file mode 100644
index 00000000..5d62cdc1
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <RootNamespace>BUTR.Site.NexusMods.Server.Models</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
+    <PackageReference Include="Vogen" Version="3.0.23" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BUTR.Site.NexusMods.Shared\BUTR.Site.NexusMods.Shared.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj.DotSettings b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj.DotSettings
new file mode 100644
index 00000000..b34f654e
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Extensions/EfCoreExtensions.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Extensions/EfCoreExtensions.cs
new file mode 100644
index 00000000..4233a0f7
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Extensions/EfCoreExtensions.cs
@@ -0,0 +1,73 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+public static class EfCoreExtensions
+{
+    private static PropertyBuilder<TVogen> HasValueObjectConversion<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> HasValueObjectConversion(this PropertyBuilder<ApplicationRole> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<ApplicationRole, string>();
+
+    public static PropertyBuilder<CrashReportFileId> HasValueObjectConversion(this PropertyBuilder<CrashReportFileId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<CrashReportFileId, string>();
+
+    public static PropertyBuilder<CrashReportId> HasValueObjectConversion(this PropertyBuilder<CrashReportId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<CrashReportId, Guid>();
+
+    public static PropertyBuilder<CrashReportUrl> HasValueObjectConversion(this PropertyBuilder<CrashReportUrl> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<CrashReportUrl, string>();
+
+    public static PropertyBuilder<CrashReportVersion> HasValueObjectConversion(this PropertyBuilder<CrashReportVersion> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<CrashReportVersion, byte>();
+
+    public static PropertyBuilder<ExceptionTypeId> HasValueObjectConversion(this PropertyBuilder<ExceptionTypeId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<ExceptionTypeId, string>();
+
+    public static PropertyBuilder<GameVersion> HasValueObjectConversion(this PropertyBuilder<GameVersion> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<GameVersion, string>();
+
+    public static PropertyBuilder<ModuleId> HasValueObjectConversion(this PropertyBuilder<ModuleId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<ModuleId, string>();
+
+    public static PropertyBuilder<ModuleVersion> HasValueObjectConversion(this PropertyBuilder<ModuleVersion> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<ModuleVersion, string>();
+
+    public static PropertyBuilder<NexusModsApiKey> HasValueObjectConversion(this PropertyBuilder<NexusModsApiKey> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<NexusModsApiKey, string>();
+
+    public static PropertyBuilder<NexusModsArticleId> HasValueObjectConversion(this PropertyBuilder<NexusModsArticleId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<NexusModsArticleId, int>();
+
+    public static PropertyBuilder<NexusModsFileId> HasValueObjectConversion(this PropertyBuilder<NexusModsFileId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<NexusModsFileId, int>();
+
+    public static PropertyBuilder<NexusModsGameDomain> HasValueObjectConversion(this PropertyBuilder<NexusModsGameDomain> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<NexusModsGameDomain, string>();
+
+    public static PropertyBuilder<NexusModsModId> HasValueObjectConversion(this PropertyBuilder<NexusModsModId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<NexusModsModId, int>();
+
+    public static PropertyBuilder<NexusModsUserEMail> HasValueObjectConversion(this PropertyBuilder<NexusModsUserEMail> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<NexusModsUserEMail, string>();
+
+    public static PropertyBuilder<NexusModsUserId> HasValueObjectConversion(this PropertyBuilder<NexusModsUserId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<NexusModsUserId, int>();
+
+    public static PropertyBuilder<NexusModsUserName> HasValueObjectConversion(this PropertyBuilder<NexusModsUserName> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<NexusModsUserName, string>();
+
+    public static PropertyBuilder<TenantId> HasValueObjectConversion(this PropertyBuilder<TenantId> propertyBuilder) =>
+        propertyBuilder.HasValueObjectConversion<TenantId, byte>();
+
+
+    public static PropertyBuilder<NexusModsModId?> HasValueObjectConversion(this PropertyBuilder<NexusModsModId?> propertyBuilder) =>
+        propertyBuilder.HasVogenConversionNullable<NexusModsModId?, NexusModsModId, int>();
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Extensions/OpenApiExtensions.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Extensions/OpenApiExtensions.cs
new file mode 100644
index 00000000..bed7a276
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Extensions/OpenApiExtensions.cs
@@ -0,0 +1,9 @@
+namespace BUTR.Site.NexusMods.Server.Models;
+
+public static class OpenApiExtensions
+{
+    public static void ValueObjectFilter(this SwaggerGenOptions opt)
+    {
+        opt.SchemaFilter<VogenSchemaFilter>();
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ApplicationRole.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ApplicationRole.cs
similarity index 74%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/ApplicationRole.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ApplicationRole.cs
index 279e6799..793cc740 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ApplicationRole.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ApplicationRole.cs
@@ -1,13 +1,3 @@
-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;
 
 using TType = ApplicationRole;
@@ -16,16 +6,18 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [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 record struct ApplicationRole : IVogen<TType, TValueType>, IHasDefaultValue<TType>
 {
+    public static readonly TType Anonymous = From(ApplicationRoles.Anonymous);
+    public static readonly TType User = From(ApplicationRoles.User);
+    public static readonly TType Moderator = From(ApplicationRoles.Moderator);
+    public static readonly TType Administrator = From(ApplicationRoles.Administrator);
+    
+    public static TType DefaultValue => Anonymous;
+    
     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);
 
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportFileId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportFileId.cs
similarity index 86%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportFileId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportFileId.cs
index 6b919057..cdc4387a 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportFileId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportFileId.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = CrashReportFileId;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportId.cs
similarity index 87%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportId.cs
index adc2d722..408c50ad 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportId.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = CrashReportId;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportUrl.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportUrl.cs
similarity index 86%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportUrl.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportUrl.cs
index a3afdf46..604ec10e 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportUrl.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportUrl.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = CrashReportUrl;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportVersion.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportVersion.cs
similarity index 87%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportVersion.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportVersion.cs
index 1cf29253..b25ee4d7 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/CrashReportVersion.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/CrashReportVersion.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = CrashReportVersion;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ExceptionTypeId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ExceptionTypeId.cs
similarity index 86%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/ExceptionTypeId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ExceptionTypeId.cs
index 83a81da3..4481a767 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ExceptionTypeId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ExceptionTypeId.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = ExceptionTypeId;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/GameVersion.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/GameVersion.cs
similarity index 87%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/GameVersion.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/GameVersion.cs
index 915db5b3..bb512e8b 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/GameVersion.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/GameVersion.cs
@@ -1,11 +1,3 @@
-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;
 
 using TType = GameVersion;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ModuleId.cs
similarity index 86%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ModuleId.cs
index 02900c01..597cade4 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ModuleId.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = ModuleId;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleVersion.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ModuleVersion.cs
similarity index 86%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleVersion.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ModuleVersion.cs
index 112c2496..3a56d721 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/ModuleVersion.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/ModuleVersion.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = ModuleVersion;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsApiKey.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsApiKey.cs
similarity index 82%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsApiKey.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsApiKey.cs
index a602770f..90532842 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsApiKey.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsApiKey.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = NexusModsApiKey;
@@ -15,13 +6,15 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
 [JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
 [ValueObject<TValueType>(conversions: Conversions.None)]
-[Instance("None", "")]
 public readonly partial record struct NexusModsApiKey : IVogen<TType, TValueType>, IHasDefaultValue<TType>
 {
+    public static readonly TType None = From(string.Empty);
+    
+    public static NexusModsApiKey DefaultValue => None;
+    
     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);
 
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsArticleId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsArticleId.cs
similarity index 87%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsArticleId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsArticleId.cs
index a07161dd..bb3dfde6 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsArticleId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsArticleId.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = NexusModsArticleId;
@@ -15,13 +6,15 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [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 readonly TType None = From(0);
+
+    public static TType DefaultValue => None;
+    
     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)
     {
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsFileId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsFileId.cs
similarity index 87%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsFileId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsFileId.cs
index 8fcc74b0..6b552ebd 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsFileId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsFileId.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = NexusModsFileId;
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsGameDomain.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsGameDomain.cs
similarity index 84%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsGameDomain.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsGameDomain.cs
index 5fe66478..4cd2e46b 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsGameDomain.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsGameDomain.cs
@@ -1,13 +1,3 @@
-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;
 
 using TType = NexusModsGameDomain;
@@ -16,15 +6,13 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [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 record struct NexusModsGameDomain : 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 readonly TType None = From(string.Empty);
+    public static readonly TType Bannerlord = From(TenantUtils.BannerlordGameDomain);
+    public static readonly TType Rimworld = From(TenantUtils.RimworldGameDomain);
+    public static readonly TType StardewValley = From(TenantUtils.StardewValleyGameDomain);
+    
     public static TType DefaultValue => None;
 
     public static IEnumerable<TType> Values
@@ -36,6 +24,10 @@ public static IEnumerable<TType> Values
             yield return StardewValley;
         }
     }
+    
+    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 bool TryParse(string urlRaw, out TType gameDomain)
     {
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsModId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsModId.cs
similarity index 89%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsModId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsModId.cs
index 0d940e86..b26258b1 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsModId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsModId.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = NexusModsModId;
@@ -15,13 +6,15 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [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 readonly TType None = From(0);
+    
+    public static TType DefaultValue => None;
+    
     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)
     {
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserEMail.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserEMail.cs
similarity index 85%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserEMail.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserEMail.cs
index 97909c9e..977294af 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserEMail.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserEMail.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = NexusModsUserEMail;
@@ -15,13 +6,15 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
 [JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
 [ValueObject<TValueType>(conversions: Conversions.None)]
-[Instance("Empty", "")]
 public readonly partial record struct NexusModsUserEMail : IVogen<TType, TValueType>, IHasDefaultValue<TType>
 {
+    public static readonly TType Empty = From(string.Empty);
+    
+    public static TType DefaultValue => Empty;
+    
     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);
 
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserId.cs
similarity index 90%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserId.cs
index 6b172ad6..d3fe12a1 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserId.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = NexusModsUserId;
@@ -15,13 +6,15 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
 [JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
 [ValueObject<TValueType>(conversions: Conversions.None)]
-[Instance("None", 0)]
 public readonly partial record struct NexusModsUserId : IVogen<TType, TValueType>, IVogenParsable<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IVogenUtf8SpanParsable<TType, TValueType>, IHasDefaultValue<TType>
 {
+    public static readonly TType None = From(0);
+    
+    public static TType DefaultValue => None;
+    
     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)
     {
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserName.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserName.cs
similarity index 85%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserName.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserName.cs
index 191c220a..6b277354 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/NexusModsUserName.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/NexusModsUserName.cs
@@ -1,12 +1,3 @@
-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;
 
 using TType = NexusModsUserName;
@@ -15,13 +6,15 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [TypeConverter(typeof(VogenTypeConverter<TType, TValueType>))]
 [JsonConverter(typeof(VogenJsonConverter<TType, TValueType>))]
 [ValueObject<TValueType>(conversions: Conversions.None)]
-[Instance("Empty", "")]
 public readonly partial record struct NexusModsUserName : IVogen<TType, TValueType>, IHasDefaultValue<TType>
 {
+    public static readonly TType Empty = From(string.Empty);
+    
+    public static TType DefaultValue => Empty;
+    
     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);
 
diff --git a/src/BUTR.Site.NexusMods.Server/Models/Vogen/TenantId.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/TenantId.cs
similarity index 83%
rename from src/BUTR.Site.NexusMods.Server/Models/Vogen/TenantId.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/TenantId.cs
index eec94e77..c6374edf 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/Vogen/TenantId.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Models/TenantId.cs
@@ -1,13 +1,3 @@
-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;
 
 using TType = TenantId;
@@ -16,15 +6,13 @@ namespace BUTR.Site.NexusMods.Server.Models;
 [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 record struct TenantId : IVogen<TType, TValueType>, IVogenParsable<TType, TValueType>, IVogenSpanParsable<TType, TValueType>, IVogenUtf8SpanParsable<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 readonly TType None = From(0);
+    public static readonly TType Bannerlord = From(TenantUtils.BannerlordId);
+    public static readonly TType Rimworld = From(TenantUtils.RimworldId);
+    public static readonly TType StardewValley = From(TenantUtils.StardewValleyId);
+    
     public static TType DefaultValue => None;
 
     public static IEnumerable<TType> Values
@@ -37,6 +25,10 @@ public static IEnumerable<TType> Values
             //yield return DarkestDungeon;
         }
     }
+    
+    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 FromTenant(int tenant)
     {
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Usings.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Usings.cs
new file mode 100644
index 00000000..bb0c8742
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Usings.cs
@@ -0,0 +1,20 @@
+global using BUTR.Site.NexusMods.Shared.Helpers;
+global using BUTR.Site.NexusMods.Server.Models;
+global using BUTR.Site.NexusMods.Server.ValueObjects.Utils;
+global using BUTR.Site.NexusMods.Server.Utils;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.EntityFrameworkCore.ChangeTracking;
+global using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+global using Microsoft.EntityFrameworkCore.Metadata.Builders;
+global using Microsoft.OpenApi.Models;
+global using Vogen;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Runtime.CompilerServices;
+global using System.Runtime.InteropServices;
+global using System.Text.Json;
+global using System.Text.Json.Serialization;
+global using System.ComponentModel;
+global using System.Globalization;
+global using System.Reflection;
+global using Swashbuckle.AspNetCore.SwaggerGen;
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasCopy.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasCopy.cs
similarity index 60%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasCopy.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasCopy.cs
index 19ee60fe..7aa9b222 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasCopy.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasCopy.cs
@@ -1,4 +1,4 @@
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public interface IHasCopy<TVogen>
 {
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDefaultValue.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasDefaultValue.cs
similarity index 65%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDefaultValue.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasDefaultValue.cs
index 145edc24..34504d54 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDefaultValue.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasDefaultValue.cs
@@ -1,4 +1,4 @@
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public interface IHasDefaultValue<out TVogen>
 {
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDeserialize.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasDeserialize.cs
similarity index 70%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDeserialize.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasDeserialize.cs
index 9c67ff99..0c9ab862 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasDeserialize.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasDeserialize.cs
@@ -1,4 +1,4 @@
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public interface IHasDeserialize<out TVogen, in TValueObject>
 {
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasIsInitialized.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasIsInitialized.cs
similarity index 65%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasIsInitialized.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasIsInitialized.cs
index 25cd24a5..77e9dc48 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasIsInitialized.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasIsInitialized.cs
@@ -1,4 +1,4 @@
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public interface IHasIsInitialized<in TVogen>
 {
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasRandomValueGenerator.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasRandomValueGenerator.cs
similarity index 79%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasRandomValueGenerator.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasRandomValueGenerator.cs
index 58802077..c89a3507 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IHasRandomValueGenerator.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IHasRandomValueGenerator.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public interface IHasRandomValueGenerator<out TVogen, out TValueObject, in TRandom>
     where TVogen : IVogen<TVogen, TValueObject>
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogen.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogen.cs
new file mode 100644
index 00000000..39552a1f
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogen.cs
@@ -0,0 +1,27 @@
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
+
+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);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenParsable.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenParsable.cs
new file mode 100644
index 00000000..1ce596b5
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenParsable.cs
@@ -0,0 +1,9 @@
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
+
+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);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenSpanParsable.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenSpanParsable.cs
new file mode 100644
index 00000000..1d1b912d
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenSpanParsable.cs
@@ -0,0 +1,9 @@
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
+
+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);
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenUtf8SpanParsable.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenUtf8SpanParsable.cs
new file mode 100644
index 00000000..144b0215
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/IVogenUtf8SpanParsable.cs
@@ -0,0 +1,9 @@
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
+
+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.ValueObjects.Vogen/Utils/VogenDefaults.cs
similarity index 94%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaults.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaults.cs
index 2e245dcd..cfef668d 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaults.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaults.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public static class VogenDefaults<TVogen, TValueObject>
     where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsParsable.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsParsable.cs
similarity index 88%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsParsable.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsParsable.cs
index 572d0641..1e2e5437 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsParsable.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsParsable.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public static class VogenDefaultsParsable<TVogen, TValueObject>
     where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsRandomValueGenerator.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsRandomValueGenerator.cs
similarity index 80%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsRandomValueGenerator.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsRandomValueGenerator.cs
index ae100ffa..aaa8a025 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsRandomValueGenerator.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsRandomValueGenerator.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public static class VogenDefaultsRandomValueGenerator<TValue, TValueObject, TRandom>
     where TValue : IVogen<TValue, TValueObject>, IHasRandomValueGenerator<TValue, TValueObject, TRandom>
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsSpanParsable.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsSpanParsable.cs
similarity index 89%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsSpanParsable.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsSpanParsable.cs
index 2c552c37..fa8b19a8 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsSpanParsable.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsSpanParsable.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public static class VogenDefaultsSpanParsable<TVogen, TValueObject>
     where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsUtf8SpanParsable.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsUtf8SpanParsable.cs
similarity index 89%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsUtf8SpanParsable.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsUtf8SpanParsable.cs
index 645b0223..00ab4e06 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenDefaultsUtf8SpanParsable.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenDefaultsUtf8SpanParsable.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public static class VogenDefaultsUtf8SpanParsable<TVogen, TValueObject>
     where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenJsonConverter.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenJsonConverter.cs
similarity index 90%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenJsonConverter.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenJsonConverter.cs
index 52408b1f..9940e0a6 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenJsonConverter.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenJsonConverter.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public class VogenJsonConverter<TVogen, TValueObject> : JsonConverter<TVogen>
     where TVogen : struct, IVogen<TVogen, TValueObject>, IHasIsInitialized<TVogen>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenSchemaFilter.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenSchemaFilter.cs
similarity index 81%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenSchemaFilter.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenSchemaFilter.cs
index 74daa0e7..9afb8803 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenSchemaFilter.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenSchemaFilter.cs
@@ -1,10 +1,4 @@
-using Microsoft.OpenApi.Models;
-
-using Swashbuckle.AspNetCore.SwaggerGen;
-
-using System.Linq;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public sealed class VogenSchemaFilter : ISchemaFilter
 {
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenTypeConverter.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenTypeConverter.cs
similarity index 90%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenTypeConverter.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenTypeConverter.cs
index d454feae..2af884fc 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenTypeConverter.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenTypeConverter.cs
@@ -1,8 +1,4 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
 public class VogenTypeConverter<TVogen, TValueObject> : TypeConverter
     where TVogen : struct, IVogen<TVogen, TValueObject>, IHasIsInitialized<TVogen>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparer.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenValueComparer.cs
similarity index 74%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparer.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenValueComparer.cs
index 6f9cc1b1..6ff74880 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparer.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenValueComparer.cs
@@ -1,10 +1,6 @@
-using Microsoft.EntityFrameworkCore.ChangeTracking;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
-using System;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
-
-public class VogenValueComparer<TVogen, TValueObject> : ValueComparer<TVogen>
+public sealed class VogenValueComparer<TVogen, TValueObject> : ValueComparer<TVogen>
     where TVogen : struct, IVogen<TVogen, TValueObject>, IHasIsInitialized<TVogen>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
     where TValueObject : notnull
 {
@@ -16,4 +12,5 @@ public VogenValueComparer() : base(
 
     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);
+    public override TVogen Snapshot(TVogen instance) => VogenDefaults<TVogen, TValueObject>.Copy(instance);
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparerReference.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenValueComparerReference.cs
similarity index 67%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparerReference.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenValueComparerReference.cs
index 053dbcb9..673406a2 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueComparerReference.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenValueComparerReference.cs
@@ -1,10 +1,6 @@
-using Microsoft.EntityFrameworkCore.ChangeTracking;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
-using System;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
-
-public class VogenValueComparerReference<TVogen, TValueObject> : ValueComparer<TVogen>
+public sealed class VogenValueComparerReference<TVogen, TValueObject> : ValueComparer<TVogen>
     where TVogen : IVogen<TVogen, TValueObject>, IEquatable<TVogen>, IEquatable<TValueObject>, IComparable<TVogen>, IComparable
     where TValueObject : notnull
 {
@@ -15,4 +11,5 @@ public VogenValueComparerReference() : base(
     { }
 
     public override int GetHashCode(TVogen instance) => VogenDefaults<TVogen, TValueObject>.GetHashCode(instance);
+    public override TVogen Snapshot(TVogen instance) => VogenDefaults<TVogen, TValueObject>.Copy(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.ValueObjects.Vogen/Utils/VogenValueConverter.cs
similarity index 68%
rename from src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueConverter.cs
rename to src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenValueConverter.cs
index e5b7cdf5..709afb00 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/VogenValueConverter.cs
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/VogenValueConverter.cs
@@ -1,10 +1,6 @@
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+namespace BUTR.Site.NexusMods.Server.ValueObjects.Utils;
 
-using System;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Vogen;
-
-public class VogenValueConverter<TVogen, TValueObject> : ValueConverter<TVogen, TValueObject>
+public sealed 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
 {
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/_CopyHelper.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/_CopyHelper.cs
new file mode 100644
index 00000000..6cd40028
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/_CopyHelper.cs
@@ -0,0 +1,26 @@
+namespace BUTR.Site.NexusMods.Server.Utils;
+
+public 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;
+    }
+}
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/_QueryableHelper.cs b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/_QueryableHelper.cs
new file mode 100644
index 00000000..42a37e9b
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server.ValueObjects.Vogen/Utils/_QueryableHelper.cs
@@ -0,0 +1,15 @@
+namespace BUTR.Site.NexusMods.Server.Utils;
+
+public static class QueryableHelper
+{
+    public static Type ConvertValueObject(Type type)
+    {
+        if (type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IVogen<,>)) is { } vogen)
+        {
+            if (vogen.GetGenericArguments() is [_, { } valueObject])
+                type = valueObject;
+        }
+
+        return type;
+    }
+}
\ No newline at end of file
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 a1fd4509..901a3ea7 100644
--- a/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj
+++ b/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj
@@ -22,14 +22,13 @@
     <PackageReference Include="BUTR.CrashReport.Bannerlord.Parser" Version="13.0.0.32" />
     <PackageReference Include="Community.Microsoft.Extensions.Caching.PostgreSql" Version="4.0.4" />
     <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.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="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
     <PackageReference Include="Mono.Posix" Version="7.1.0-final.1.21458.1" />
     <PackageReference Include="Nerdbank.Streams" Version="2.10.72" />
-    <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="Npgsql" Version="8.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
+    <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.0" />
     <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.7.0-alpha.1" />
@@ -41,28 +40,31 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-alpha.3" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
     <PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.4" />
-    <PackageReference Include="Polly" Version="7.2.4" />
+    <PackageReference Include="Polly" Version="8.2.0" />
     <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
-    <PackageReference Include="Quartz" Version="3.7.0" />
-    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.7.0" />
-    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.7.0" />
+    <PackageReference Include="Quartz" Version="3.8.0" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.8.0" />
+    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.8.0" />
     <PackageReference Include="RateLimiter" Version="2.2.0" />
-    <PackageReference Include="SharpCompress" Version="0.34.1" />
+    <PackageReference Include="SharpCompress" Version="0.34.2" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-    <PackageReference Include="Vogen" Version="3.0.23" />
-    <PackageReference Update="GitVersion.MsBuild" Version="5.12.0" />
-    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="8.0.0-rc.2.23480.1-02" />
+    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="8.101.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="FileFilters.regexp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BUTR.Site.NexusMods.Server.ValueObjects.Vogen\BUTR.Site.NexusMods.Server.ValueObjects.Vogen.csproj" />
     <ProjectReference Include="..\BUTR.Site.NexusMods.Shared\BUTR.Site.NexusMods.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="FileFilters.regexp">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <ProjectReference Include="..\BUTR.Site.NexusMods.Shared\BUTR.Site.NexusMods.Shared.csproj" />
   </ItemGroup>
 
   <Target Name="_ResolveCopyLocalNuGetPkgXmls" AfterTargets="ResolveReferences">
@@ -72,10 +74,4 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="GenerateOpenApi" Condition="$(DOTNET_RUNNING_IN_CONTAINER) != true" AfterTargets="PostBuildEvent">
-    <Exec Command="dotnet new tool-manifest --force" />
-    <Exec Command="dotnet tool install --local Swashbuckle.AspNetCore.Cli --version 6.5.0" />
-    <Exec Command="dotnet swagger tofile --output ../swagger.json $(OutputPath)$(AssemblyName).dll v1" />
-  </Target>
-
 </Project>
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj.DotSettings b/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj.DotSettings
index f42748e0..110ffa2f 100644
--- a/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj.DotSettings
+++ b/src/BUTR.Site.NexusMods.Server/BUTR.Site.NexusMods.Server.csproj.DotSettings
@@ -1,3 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=controllers_005Cexternal/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cdatabase_005Cjson/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cvalueobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=models_005Cvogen/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Cexternalstorage/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=services_005Chttpclients/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ 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 cf7d5572..04d7f850 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextRead.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextRead.cs
@@ -1,10 +1,7 @@
-using BUTR.Site.NexusMods.Server.Options;
-
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 using System;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -12,40 +9,27 @@ 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)}'!");
-
+    public override bool IsReadOnly => true;
 
-    private readonly IDbContextFactory<AppDbContextRead> _dbContextFactory;
+    public static Exception WriteNotSupported() => throw new NotSupportedException($"Write operations not supported with '{nameof(AppDbContextRead)}'!");
 
     public AppDbContextRead(
-        IDbContextFactory<AppDbContextRead> dbContextFactory,
-        IOptions<ConnectionStringsOptions> connectionStringsOptions,
+        NpgsqlDataSourceProvider dataSourceProvider,
         IEntityConfigurationFactory entityConfigurationFactory,
-        IOptions<JsonSerializerOptions> jsonSerializerOptions,
-        DbContextOptions<AppDbContextRead> options) : base(connectionStringsOptions, entityConfigurationFactory, jsonSerializerOptions, options)
+        DbContextOptions<AppDbContextRead> options) : base(dataSourceProvider, entityConfigurationFactory, options)
     {
-        _dbContextFactory = dbContextFactory;
+        
     }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
-        if (!optionsBuilder.IsConfigured)
-        {
-            optionsBuilder.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTrackingWithIdentityResolution);
-        }
+        optionsBuilder.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTrackingWithIdentityResolution);
 
         base.OnConfiguring(optionsBuilder);
     }
 
-    public AppDbContextRead New() => _dbContextFactory.CreateDbContext();
+    public AppDbContextRead New() => this.GetService<IDbContextFactory<AppDbContextRead>>().CreateDbContext();
 
-    public override int SaveChanges(bool acceptAllChangesOnSuccess)
-    {
-        throw WriteNotSupported();
-    }
-
-    public override Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = new CancellationToken())
-    {
-        throw WriteNotSupported();
-    }
+    public override int SaveChanges(bool acceptAllChangesOnSuccess) => throw WriteNotSupported();
+    public override Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken ct = default) => 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 6999c4c0..00b78d8a 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextWrite.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/AppDbContextWrite.cs
@@ -1,16 +1,12 @@
 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;
 
@@ -55,35 +51,29 @@ public async ValueTask DisposeAsync()
         }
     }
 
-    private readonly IDbContextFactory<AppDbContextWrite> _dbContextFactory;
     private readonly ITenantContextAccessor _tenantContextAccessor;
+    
     private EntityFactory? _entityFactory;
     private List<Func<Task>>? _onSave;
 
     public AppDbContextWrite(
-        IDbContextFactory<AppDbContextWrite> dbContextFactory,
         ITenantContextAccessor tenantContextAccessor,
-        IOptions<ConnectionStringsOptions> connectionStringsOptions,
+        NpgsqlDataSourceProvider dataSourceProvider,
         IEntityConfigurationFactory entityConfigurationFactory,
-        IOptions<JsonSerializerOptions> jsonSerializerOptions,
-        DbContextOptions<AppDbContextWrite> options) : base(connectionStringsOptions, entityConfigurationFactory, jsonSerializerOptions, options)
+        DbContextOptions<AppDbContextWrite> options) : base(dataSourceProvider, entityConfigurationFactory, options)
     {
-        _dbContextFactory = dbContextFactory;
         _tenantContextAccessor = tenantContextAccessor;
     }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
-        if (!optionsBuilder.IsConfigured)
-        {
-            optionsBuilder.UseQueryTrackingBehavior(QueryTrackingBehavior.TrackAll);
-        }
+        optionsBuilder.UseQueryTrackingBehavior(QueryTrackingBehavior.TrackAll);
 
         base.OnConfiguring(optionsBuilder);
     }
 
 
-    public AppDbContextWrite New() => _dbContextFactory.CreateDbContext();
+    public AppDbContextWrite New() => this.GetService<IDbContextFactory<AppDbContextWrite>>().CreateDbContext();
 
     public EntityFactory GetEntityFactory() => _entityFactory ??= new EntityFactory(_tenantContextAccessor, this);
 
@@ -95,9 +85,6 @@ public Task<IAppDbContextSaveScope> CreateSaveScopeAsync()
 
     public async Task SaveAsync(CancellationToken ct)
     {
-        if (IsReadOnly)
-            throw new NotSupportedException("The Save method is not supported on read-only database contexts.");
-
         if (!ChangeTracker.HasChanges() && _entityFactory is null && _onSave?.Count == 0)
             return;
 
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/BaseAppDbContext.cs b/src/BUTR.Site.NexusMods.Server/Contexts/BaseAppDbContext.cs
index 9af19a47..ee678ed6 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/BaseAppDbContext.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/BaseAppDbContext.cs
@@ -1,15 +1,10 @@
 using BUTR.Site.NexusMods.Server.Models.Database;
-using BUTR.Site.NexusMods.Server.Options;
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.Extensions.Options;
-
-using Npgsql;
 
 using System;
-using System.Text.Json;
 
 namespace BUTR.Site.NexusMods.Server.Contexts;
 
@@ -18,75 +13,70 @@ namespace BUTR.Site.NexusMods.Server.Contexts;
 /// </summary>
 public class BaseAppDbContext : DbContext
 {
-    private readonly ConnectionStringsOptions _options;
+    private readonly NpgsqlDataSourceProvider _dataSourceProvider;
     private readonly IEntityConfigurationFactory _entityConfigurationFactory;
-    private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-    public required bool IsReadOnly { get; set; }
+    public virtual bool IsReadOnly => false;
 
-    public required DbSet<TenantEntity> Tenants { get; set; }
+    public DbSet<TenantEntity> Tenants { get; set; } = default!;
 
-    public required DbSet<AutocompleteEntity> Autocompletes { get; set; }
+    public DbSet<AutocompleteEntity> Autocompletes { get; set; } = default!;
 
-    public required DbSet<ExceptionTypeEntity> ExceptionTypes { get; set; }
+    public DbSet<ExceptionTypeEntity> ExceptionTypes { get; set; } = default!;
 
-    public required DbSet<ModuleEntity> Modules { get; set; }
+    public DbSet<ModuleEntity> Modules { get; set; } = default!;
 
-    public required DbSet<CrashReportEntity> CrashReports { get; set; }
-    public required DbSet<CrashReportToMetadataEntity> CrashReportToMetadatas { get; set; }
-    public required DbSet<CrashReportToModuleMetadataEntity> CrashReportModuleInfos { get; set; }
-    public required DbSet<CrashReportToFileIdEntity> CrashReportToFileIds { get; set; }
-    public required DbSet<CrashReportIgnoredFileEntity> CrashReportIgnoredFileIds { get; set; }
+    public DbSet<CrashReportEntity> CrashReports { get; set; } = default!;
+    public DbSet<CrashReportToMetadataEntity> CrashReportToMetadatas { get; set; } = default!;
+    public DbSet<CrashReportToModuleMetadataEntity> CrashReportModuleInfos { get; set; } = default!;
+    public DbSet<CrashReportToFileIdEntity> CrashReportToFileIds { get; set; } = default!;
+    public DbSet<CrashReportIgnoredFileEntity> CrashReportIgnoredFileIds { get; set; } = default!;
 
-    public required DbSet<NexusModsUserEntity> NexusModsUsers { get; set; }
-    public required DbSet<NexusModsUserToNameEntity> NexusModsUserToName { get; set; }
-    public required DbSet<NexusModsUserToCrashReportEntity> NexusModsUserToCrashReports { get; set; }
-    public required DbSet<NexusModsUserToNexusModsModEntity> NexusModsUserToNexusModsMods { get; set; }
-    public required DbSet<NexusModsUserToModuleEntity> NexusModsUserToModules { get; set; }
+    public DbSet<NexusModsUserEntity> NexusModsUsers { get; set; } = default!;
+    public DbSet<NexusModsUserToNameEntity> NexusModsUserToName { get; set; } = default!;
+    public DbSet<NexusModsUserToCrashReportEntity> NexusModsUserToCrashReports { get; set; } = default!;
+    public DbSet<NexusModsUserToNexusModsModEntity> NexusModsUserToNexusModsMods { get; set; } = default!;
+    public DbSet<NexusModsUserToModuleEntity> NexusModsUserToModules { get; set; } = default!;
 
-    public required DbSet<NexusModsUserToIntegrationDiscordEntity> NexusModsUserToDiscord { get; set; }
-    public required DbSet<NexusModsUserToIntegrationGOGEntity> NexusModsUserToGOG { get; set; }
-    public required DbSet<NexusModsUserToIntegrationSteamEntity> NexusModsUserToSteam { get; set; }
+    public DbSet<NexusModsUserToIntegrationDiscordEntity> NexusModsUserToDiscord { get; set; } = default!;
+    public DbSet<NexusModsUserToIntegrationGOGEntity> NexusModsUserToGOG { get; set; } = default!;
+    public DbSet<NexusModsUserToIntegrationSteamEntity> NexusModsUserToSteam { get; set; } = default!;
 
-    public required DbSet<IntegrationDiscordTokensEntity> IntegrationDiscordTokens { get; set; }
-    public required DbSet<IntegrationGOGTokensEntity> IntegrationGOGTokens { get; set; }
-    public required DbSet<IntegrationGOGToOwnedTenantEntity> IntegrationGOGToOwnedTenants { get; set; }
-    public required DbSet<IntegrationSteamTokensEntity> IntegrationSteamTokens { get; set; }
-    public required DbSet<IntegrationSteamToOwnedTenantEntity> IntegrationSteamToOwnedTenants { get; set; }
+    public DbSet<IntegrationDiscordTokensEntity> IntegrationDiscordTokens { get; set; } = default!;
+    public DbSet<IntegrationGOGTokensEntity> IntegrationGOGTokens { get; set; } = default!;
+    public DbSet<IntegrationGOGToOwnedTenantEntity> IntegrationGOGToOwnedTenants { get; set; } = default!;
+    public DbSet<IntegrationSteamTokensEntity> IntegrationSteamTokens { get; set; } = default!;
+    public DbSet<IntegrationSteamToOwnedTenantEntity> IntegrationSteamToOwnedTenants { get; set; } = default!;
 
-    public required DbSet<NexusModsArticleEntity> NexusModsArticles { get; set; }
+    public DbSet<NexusModsArticleEntity> NexusModsArticles { get; set; } = default!;
 
-    public required DbSet<NexusModsModEntity> NexusModsMods { get; set; }
-    public required DbSet<NexusModsModToNameEntity> NexusModsModName { get; set; }
-    public required DbSet<NexusModsModToModuleEntity> NexusModsModModules { get; set; }
-    public required DbSet<NexusModsModToFileUpdateEntity> NexusModsModToFileUpdates { get; set; }
-    public required DbSet<NexusModsModToModuleInfoHistoryEntity> NexusModsModToModuleInfoHistory { get; set; }
+    public DbSet<NexusModsModEntity> NexusModsMods { get; set; } = default!;
+    public DbSet<NexusModsModToNameEntity> NexusModsModName { get; set; } = default!;
+    public DbSet<NexusModsModToModuleEntity> NexusModsModModules { get; set; } = default!;
+    public DbSet<NexusModsModToFileUpdateEntity> NexusModsModToFileUpdates { get; set; } = default!;
+    public DbSet<NexusModsModToModuleInfoHistoryEntity> NexusModsModToModuleInfoHistory { get; set; } = default!;
 
-    public required DbSet<StatisticsTopExceptionsTypeEntity> StatisticsTopExceptionsTypes { get; set; }
-    public required DbSet<StatisticsCrashScoreInvolvedEntity> StatisticsCrashScoreInvolveds { get; set; }
+    public DbSet<StatisticsTopExceptionsTypeEntity> StatisticsTopExceptionsTypes { get; set; } = default!;
+    public DbSet<StatisticsCrashScoreInvolvedEntity> StatisticsCrashScoreInvolveds { get; set; } = default!;
 
-    public required DbSet<QuartzExecutionLogEntity> QuartzExecutionLogs { get; set; }
+    public DbSet<QuartzExecutionLogEntity> QuartzExecutionLogs { get; set; } = default!;
 
     public BaseAppDbContext(
-        IOptions<ConnectionStringsOptions> option,
+        NpgsqlDataSourceProvider dataSourceProvider,
         IEntityConfigurationFactory entityConfigurationFactory,
-        IOptions<JsonSerializerOptions> jsonSerializerOptions,
         DbContextOptions<BaseAppDbContext> options) : base(options)
     {
-        _options = option.Value;
+        _dataSourceProvider = dataSourceProvider;
         _entityConfigurationFactory = entityConfigurationFactory;
-        _jsonSerializerOptions = jsonSerializerOptions.Value;
     }
 
     protected BaseAppDbContext(
-        IOptions<ConnectionStringsOptions> connectionStringsOptions,
+        NpgsqlDataSourceProvider dataSourceProvider,
         IEntityConfigurationFactory entityConfigurationFactory,
-        IOptions<JsonSerializerOptions> jsonSerializerOptions,
         DbContextOptions options) : base(options)
     {
-        _options = connectionStringsOptions.Value;
+        _dataSourceProvider = dataSourceProvider;
         _entityConfigurationFactory = entityConfigurationFactory;
-        _jsonSerializerOptions = jsonSerializerOptions.Value;
     }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -142,23 +132,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
-        if (!optionsBuilder.IsConfigured)
-        {
-            var dataSource = new NpgsqlDataSourceBuilder(IsReadOnly && !string.IsNullOrEmpty(_options.Replica) ? _options.Replica : _options.Main)
-                .EnableDynamicJsonMappings(_jsonSerializerOptions)
-                .Build();
-
-            optionsBuilder
-                .ConfigureWarnings(x => x.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning))
-                .ReplaceService<IModelCacheKeyFactory, TenantModelCacheKeyFactory>()
-                .UseNpgsql(dataSource, opt =>
-                {
-                    opt.EnableRetryOnFailure(50, TimeSpan.FromSeconds(5), null);
-                    opt.MigrationsHistoryTable("ef_migrations_history", "ef");
-                })
-                //.AddPrepareInterceptor()
-                .EnableSensitiveDataLogging()
-                /*.UseLoggerFactory(LoggerFactory.Create(b => b.AddFilter(level => level >= LogLevel.Information)))*/;
-        }
+        var dataSource = IsReadOnly ? _dataSourceProvider.ReadDataSource() : _dataSourceProvider.WriteDataSource();
+
+        optionsBuilder
+            .ConfigureWarnings(x => x.Ignore(CoreEventId.SensitiveDataLoggingEnabledWarning))
+            .ConfigureWarnings(x => x.Ignore(RelationalEventId.ModelValidationKeyDefaultValueWarning))
+            .ReplaceService<IModelCacheKeyFactory, TenantModelCacheKeyFactory>()
+            .UseNpgsql(dataSource, opt =>
+            {
+                opt.EnableRetryOnFailure(50, TimeSpan.FromSeconds(5), null);
+                opt.MigrationsHistoryTable("ef_migrations_history", "ef");
+            })
+            //.AddPrepareInterceptor()
+            .EnableSensitiveDataLogging()
+            /*.UseLoggerFactory(LoggerFactory.Create(b => b.AddFilter(level => level >= LogLevel.Information)))*/;
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfiguration.cs
index 4a19c7e9..3d9c5503 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfiguration.cs
@@ -5,7 +5,7 @@
 
 namespace BUTR.Site.NexusMods.Server.Contexts.Configs;
 
-public abstract class BaseEntityConfiguration<TEntity> where TEntity : class, IEntity
+public abstract class BaseEntityConfiguration<TEntity>: IEntityConfiguration where TEntity : class, IEntity
 {
     public virtual void Configure(ModelBuilder builder) => ConfigureModel(builder.Entity<TEntity>());
     protected virtual void ConfigureModel(EntityTypeBuilder<TEntity> builder) { }
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfigurationWithTenant.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/BaseEntityConfigurationWithTenant.cs
index ee4935df..59440b4b 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion();
+        builder.Property(x => x.TenantId).HasColumnName("tenant").HasValueObjectConversion();
         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 3fb9589e..96b1eed4 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,13 +12,13 @@ public CrashReportEntityConfiguration(ITenantContextAccessor tenantContextAccess
 
     protected override void ConfigureModel(EntityTypeBuilder<CrashReportEntity> builder)
     {
-        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.CrashReportId).HasColumnName("crash_report_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property(x => x.Version).HasColumnName("version").HasValueObjectConversion();
+        builder.Property(x => x.GameVersion).HasColumnName("game_version").HasValueObjectConversion();
+        builder.Property<ExceptionTypeId>(nameof(ExceptionTypeEntity.ExceptionTypeId)).HasColumnName("exception_type_id").HasValueObjectConversion();
         builder.Property(x => x.Exception).HasColumnName("exception");
         builder.Property(x => x.CreatedAt).HasColumnName("created_at");
-        builder.Property(x => x.Url).HasColumnName("url").HasVogenConversion();
+        builder.Property(x => x.Url).HasColumnName("url").HasValueObjectConversion();
         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 96be7d4d..f4d3833d 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.Value).HasColumnName("crash_report_file_ignored_id").HasValueObjectConversion().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 508458d1..e7a21ea3 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion().ValueGeneratedNever();
-        builder.Property(x => x.FileId).HasColumnName("file_id").HasVogenConversion();
+        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_file_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property(x => x.FileId).HasColumnName("file_id").HasValueObjectConversion();
         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 b642bcec..7738840f 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_metadata_id").HasValueObjectConversion().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 338c4627..b595201a 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToModuleMetadataEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/CrashReportToModuleMetadataEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,10 +12,10 @@ public CrashReportToModuleMetadataEntityConfiguration(ITenantContextAccessor ten
 
     protected override void ConfigureModel(EntityTypeBuilder<CrashReportToModuleMetadataEntity> builder)
     {
-        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.CrashReportId).HasColumnName("crash_report_module_info_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasValueObjectConversion();
+        builder.Property(x => x.Version).HasValueObjectConversion().HasColumnName("version");
+        builder.Property<NexusModsModId?>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_id").HasValueObjectConversion().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 987f6754..ffc16116 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion();
+        builder.Property(x => x.ExceptionTypeId).HasColumnName("exception_type_id").HasValueObjectConversion();
         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/IEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IEntityConfiguration.cs
new file mode 100644
index 00000000..4b0aab8b
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IEntityConfiguration.cs
@@ -0,0 +1,3 @@
+namespace BUTR.Site.NexusMods.Server.Contexts.Configs;
+
+public interface IEntityConfiguration;
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationDiscordTokensEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationDiscordTokensEntityConfiguration.cs
index 66bc61d0..7f214c84 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationDiscordTokensEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationDiscordTokensEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -11,7 +10,7 @@ public class IntegrationDiscordTokensEntityConfiguration : BaseEntityConfigurati
 {
     protected override void ConfigureModel(EntityTypeBuilder<IntegrationDiscordTokensEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_discord_tokens_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_discord_tokens_id").HasValueObjectConversion().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 30c83165..370d531d 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion();
+        builder.Property(x => x.OwnedTenant).HasColumnName("owned_tenant").HasValueObjectConversion();
         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 4adadc63..4831cc54 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGTokensEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationGOGTokensEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -11,7 +10,7 @@ public class IntegrationGOGTokensEntityConfiguration : BaseEntityConfiguration<I
 {
     protected override void ConfigureModel(EntityTypeBuilder<IntegrationGOGTokensEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_gog_tokens_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_gog_tokens_id").HasValueObjectConversion().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 484d3707..3d105e23 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion();
+        builder.Property(x => x.OwnedTenant).HasColumnName("owned_tenant").HasValueObjectConversion();
         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 3984050e..33db0816 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamTokensEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/IntegrationSteamTokensEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -11,7 +10,7 @@ public sealed class IntegrationSteamTokensEntityConfiguration : BaseEntityConfig
 {
     protected override void ConfigureModel(EntityTypeBuilder<IntegrationSteamTokensEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_steam_tokens_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("integration_steam_tokens_id").HasValueObjectConversion().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 f72b6129..76296185 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.ModuleId).HasColumnName("module_id").HasValueObjectConversion().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 39d61c6a..cff6b821 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsArticleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsArticleEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,9 +12,9 @@ public NexusModsArticleEntityConfiguration(ITenantContextAccessor tenantContextA
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsArticleEntity> builder)
     {
-        builder.Property(x => x.NexusModsArticleId).HasColumnName("nexusmods_article_entity_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.NexusModsArticleId).HasColumnName("nexusmods_article_entity_id").HasValueObjectConversion().ValueGeneratedNever();
         builder.Property(x => x.Title).HasColumnName("title");
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("author_id").HasVogenConversion();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("author_id").HasValueObjectConversion();
         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 dd34df96..3f9b1617 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion();
+        builder.Property(x => x.NexusModsModId).HasColumnName("nexusmods_mod_id").HasValueObjectConversion();
         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 ec0da015..a08ea157 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToFileUpdateEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToFileUpdateEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,7 +12,7 @@ public NexusModsModToFileUpdateEntityConfiguration(ITenantContextAccessor tenant
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModToFileUpdateEntity> builder)
     {
-        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_file_update_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_file_update_id").HasValueObjectConversion().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 6c2df37c..2ac012b3 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,8 +12,8 @@ public NexusModsModToModuleEntityConfiguration(ITenantContextAccessor tenantCont
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModToModuleEntity> builder)
     {
-        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<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_module_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasValueObjectConversion();
         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 03ae0da2..e4185429 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleInfoHistoryEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToModuleInfoHistoryEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,10 +12,10 @@ public NexusModsModToModuleInfoHistoryEntityConfiguration(ITenantContextAccessor
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModToModuleInfoHistoryEntity> builder)
     {
-        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<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_module_info_history_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property(x => x.NexusModsFileId).HasColumnName("nexusmods_file_id").HasValueObjectConversion();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasValueObjectConversion();
+        builder.Property(x => x.ModuleVersion).HasColumnName("module_version").HasValueObjectConversion();
         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 2244b40d..5826ac34 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToNameEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsModToNameEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,7 +12,7 @@ public NexusModsModToNameEntityConfiguration(ITenantContextAccessor tenantContex
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsModToNameEntity> builder)
     {
-        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_name_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_name_id").HasValueObjectConversion().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 c8ef201b..56f35b6f 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion().ValueGeneratedNever();
+        builder.Property(x => x.NexusModsUserId).HasColumnName("nexusmods_user_id").HasValueObjectConversion().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 050b5d18..d583a617 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToCrashReportEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToCrashReportEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,8 +12,8 @@ public NexusModsUserToCrashReportEntityConfiguration(ITenantContextAccessor tena
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToCrashReportEntity> builder)
     {
-        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<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_crash_report_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property(x => x.CrashReportId).HasColumnName("crash_report_id").HasValueObjectConversion();
         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 26e5ccae..8f80dab2 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationDiscordEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationDiscordEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -11,7 +10,7 @@ public class NexusModsUserToIntegrationDiscordEntityConfiguration : BaseEntityCo
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToIntegrationDiscordEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_discord_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_discord_id").HasValueObjectConversion().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 c22332c3..f677d35a 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationGOGEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationGOGEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -11,7 +10,7 @@ public class NexusModsUserToIntegrationGOGEntityConfiguration : BaseEntityConfig
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToIntegrationGOGEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_gog_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_gog_id").HasValueObjectConversion().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 7369d7e2..6317ee8a 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationSteamEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToIntegrationSteamEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -11,7 +10,7 @@ public class NexusModsUserToIntegrationSteamEntityConfiguration : BaseEntityConf
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToIntegrationSteamEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_steam_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_to_steam_id").HasValueObjectConversion().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 03f889ff..74bceaff 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToModuleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToModuleEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,8 +12,8 @@ public NexusModsUserToModuleEntityConfiguration(ITenantContextAccessor tenantCon
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToModuleEntity> builder)
     {
-        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<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_module_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasValueObjectConversion();
         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 420bd08b..2976f145 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNameEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNameEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -11,8 +10,8 @@ public class NexusModsUserToNameEntityConfiguration : BaseEntityConfiguration<Ne
 {
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToNameEntity> builder)
     {
-        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_name_id").HasVogenConversion().ValueGeneratedNever();
-        builder.Property(x => x.Name).HasColumnName("name").HasVogenConversion();
+        builder.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_name_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property(x => x.Name).HasColumnName("name").HasValueObjectConversion();
         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 016adc8b..aa2c8ca3 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNexusModsModEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToNexusModsModEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,8 +12,8 @@ public NexusModsUserToNexusModsModEntityConfiguration(ITenantContextAccessor ten
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToNexusModsModEntity> builder)
     {
-        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<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_nexusmods_mod_id").HasValueObjectConversion();
+        builder.Property<NexusModsModId>(nameof(NexusModsModEntity.NexusModsModId)).HasColumnName("nexusmods_mod_id").HasValueObjectConversion();
         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 13795f7d..21f3bcb7 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToRoleEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/NexusModsUserToRoleEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,9 +12,9 @@ public NexusModsUserToRoleEntityConfiguration(ITenantContextAccessor tenantConte
 
     protected override void ConfigureModel(EntityTypeBuilder<NexusModsUserToRoleEntity> builder)
     {
-        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.Property<NexusModsUserId>(nameof(NexusModsUserEntity.NexusModsUserId)).HasColumnName("nexusmods_user_role_id").HasValueObjectConversion().ValueGeneratedNever();
+        builder.Property(x => x.Role).HasColumnName("role").HasValueObjectConversion();
+        builder.Property(x => x.TenantId).HasColumnName("tenant").HasValueObjectConversion();
         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/StatisticsCrashScoreInvolvedEntityConfiguration.cs b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsCrashScoreInvolvedEntityConfiguration.cs
index 906914c7..862f2d85 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsCrashScoreInvolvedEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsCrashScoreInvolvedEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -14,9 +13,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").HasVogenConversion();
-        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasVogenConversion();
-        builder.Property(x => x.ModuleVersion).HasColumnName("module_version").HasVogenConversion();
+        builder.Property(x => x.GameVersion).HasColumnName("game_version").HasValueObjectConversion();
+        builder.Property<ModuleId>(nameof(ModuleEntity.ModuleId)).HasColumnName("module_id").HasValueObjectConversion();
+        builder.Property(x => x.ModuleVersion).HasColumnName("module_version").HasValueObjectConversion();
         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 c17a67da..669fe6d0 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsTopExceptionsTypeEntityConfiguration.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/Configs/StatisticsTopExceptionsTypeEntityConfiguration.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Models.Database;
 
@@ -13,7 +12,7 @@ public StatisticsTopExceptionsTypeEntityConfiguration(ITenantContextAccessor ten
 
     protected override void ConfigureModel(EntityTypeBuilder<StatisticsTopExceptionsTypeEntity> builder)
     {
-        builder.Property<ExceptionTypeId>(nameof(ExceptionTypeEntity.ExceptionTypeId)).HasColumnName("top_exceptions_type_id").HasVogenConversion().ValueGeneratedNever();
+        builder.Property<ExceptionTypeId>(nameof(ExceptionTypeEntity.ExceptionTypeId)).HasColumnName("top_exceptions_type_id").HasValueObjectConversion().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 11daa49f..06eea4c3 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.Extensions;
+using BUTR.Site.NexusMods.Server.Models;
 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").HasVogenConversion();
+        builder.Property(x => x.TenantId).HasColumnName("tenant_id").HasValueObjectConversion();
         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 396eeb11..61f64712 100644
--- a/src/BUTR.Site.NexusMods.Server/Contexts/EntityConfigurationFactory.cs
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/EntityConfigurationFactory.cs
@@ -2,30 +2,30 @@
 using BUTR.Site.NexusMods.Server.Models.Database;
 
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
 
-using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace BUTR.Site.NexusMods.Server.Contexts;
 
 public class EntityConfigurationFactory : IEntityConfigurationFactory
 {
-    private readonly IServiceProvider _serviceProvider;
+    private readonly IEntityConfiguration[] _entityConfigurations;
 
-    public EntityConfigurationFactory(IServiceProvider serviceProvider)
+    public EntityConfigurationFactory(IEnumerable<IEntityConfiguration> entityConfigurations)
     {
-        _serviceProvider = serviceProvider;
+        _entityConfigurations = entityConfigurations.ToArray();
     }
 
     public void ApplyConfiguration<TEntity>(ModelBuilder modelBuilder) where TEntity : class, IEntity
     {
-        var configuration = _serviceProvider.GetRequiredService<BaseEntityConfiguration<TEntity>>();
+        var configuration = _entityConfigurations.OfType<BaseEntityConfiguration<TEntity>>().First();
         configuration.Configure(modelBuilder);
     }
 
     public void ApplyConfigurationWithTenant<TEntity>(ModelBuilder modelBuilder) where TEntity : class, IEntityWithTenant
     {
-        var configuration = _serviceProvider.GetRequiredService<BaseEntityConfigurationWithTenant<TEntity>>();
+        var configuration = _entityConfigurations.OfType<BaseEntityConfigurationWithTenant<TEntity>>().First();
         configuration.Configure(modelBuilder);
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Contexts/NpgsqlDataSourceProvider.cs b/src/BUTR.Site.NexusMods.Server/Contexts/NpgsqlDataSourceProvider.cs
new file mode 100644
index 00000000..4f0d326a
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Server/Contexts/NpgsqlDataSourceProvider.cs
@@ -0,0 +1,50 @@
+using BUTR.Site.NexusMods.Server.Options;
+
+using Microsoft.Extensions.Options;
+
+using Npgsql;
+
+using System.Text.Json;
+
+namespace BUTR.Site.NexusMods.Server.Contexts;
+
+public sealed class NpgsqlDataSourceProvider
+{
+    private ConnectionStringsOptions _options;
+    private JsonSerializerOptions _jsonSerializerOptions;
+    
+    private NpgsqlDataSource _main;
+    private NpgsqlDataSource _replica;
+
+    public NpgsqlDataSourceProvider(IOptionsMonitor<ConnectionStringsOptions> option, IOptionsMonitor<JsonSerializerOptions> jsonSerializerOptions)
+    {
+        _options = option.CurrentValue;
+        _jsonSerializerOptions = jsonSerializerOptions.CurrentValue;
+        
+        option.OnChange(Listener1);
+        jsonSerializerOptions.OnChange(Listener2);
+
+        _main = default!;
+        _replica = default!;
+        Rebuild();
+    }
+
+    private void Listener1(ConnectionStringsOptions option) => _options = option;
+    private void Listener2(JsonSerializerOptions jsonSerializerOptions) => _jsonSerializerOptions = jsonSerializerOptions;
+
+    private void Rebuild()
+    {
+        _main = new NpgsqlDataSourceBuilder(_options.Main)
+            .ConfigureJsonOptions(_jsonSerializerOptions)
+            .EnableDynamicJson()
+            .Build();
+        
+        _replica = new NpgsqlDataSourceBuilder(_options.Replica)
+            .ConfigureJsonOptions(_jsonSerializerOptions)
+            .EnableDynamicJson()
+            .Build();
+    }
+
+    public NpgsqlDataSource WriteDataSource() => _main;
+    public NpgsqlDataSource ReadDataSource() => _main;
+}
\ 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
index 67767b3a..870efefa 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsAnalyzerController.cs
@@ -68,8 +68,11 @@ public CrashReportsAnalyzerController(ILogger<CrashReportsAnalyzerController> lo
 
     private async IAsyncEnumerable<ModuleSuggestedFix> GetModuleSuggestionsAsync(CrashReportModel crashReport, [EnumeratorCancellation] CancellationToken ct)
     {
-        static bool GetTypeLoadExceptionLevel(ExceptionModel? exceptionModel, ref int level)
+        static bool GetTypeLoadExceptionLevel(ExceptionModel? exceptionModel, ref int level, CancellationToken ct)
         {
+            if (ct.IsCancellationRequested)
+                return false;
+            
             if (exceptionModel is null)
                 return false;
 
@@ -77,14 +80,14 @@ static bool GetTypeLoadExceptionLevel(ExceptionModel? exceptionModel, ref int le
                 return true;
 
             level++;
-            return GetTypeLoadExceptionLevel(exceptionModel.InnerException, ref level);
+            return GetTypeLoadExceptionLevel(exceptionModel.InnerException, ref level, ct);
         }
 
         await Task.Yield();
 
         //
         var level = 1;
-        if (GetTypeLoadExceptionLevel(crashReport.Exception, ref level))
+        if (GetTypeLoadExceptionLevel(crashReport.Exception, ref level, ct))
         {
             var involvedModule = crashReport.InvolvedModules[level];
             yield return new ModuleSuggestedFix
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs
index 197e81e0..79bc9c16 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/CrashReportsController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
@@ -10,7 +9,6 @@
 using BUTR.Site.NexusMods.Server.Utils.Http.StreamingJson;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/DiscordController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/DiscordController.cs
index 39d2ccf4..5954fcf0 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/DiscordController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/DiscordController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
@@ -8,7 +7,6 @@
 using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/ExposedModsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/ExposedModsController.cs
index a19d1139..ce7a26c8 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/ExposedModsController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/ExposedModsController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
@@ -6,9 +5,7 @@
 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;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/GOGController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/GOGController.cs
index 8ddb396e..b4b08bb5 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/GOGController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/GOGController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Services;
@@ -6,7 +5,6 @@
 using BUTR.Site.NexusMods.Server.Utils.APIResponses;
 using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 using System;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/GamePublicApiDiffController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/GamePublicApiDiffController.cs
index aff3ef94..05c7cc2a 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/GamePublicApiDiffController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/GamePublicApiDiffController.cs
@@ -2,7 +2,6 @@
 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;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/GameSourceDiffController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/GameSourceDiffController.cs
index 13bb31fd..a402a1d0 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/GameSourceDiffController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/GameSourceDiffController.cs
@@ -1,12 +1,9 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 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;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsArticleController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsArticleController.cs
index 2d018bf3..d22877c9 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsArticleController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsArticleController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
@@ -6,9 +5,7 @@
 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;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsModController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsModController.cs
index e7e9747d..7a1ed5a9 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsModController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsModController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
@@ -10,7 +9,6 @@
 using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsUserController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsUserController.cs
index 5f0013e5..5320775d 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsUserController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/NexusModsUserController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
@@ -10,7 +9,6 @@
 using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/QuartzController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/QuartzController.cs
index 249b9c14..344198ad 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/QuartzController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/QuartzController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Contexts;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
@@ -9,7 +8,6 @@
 using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/ReportsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/ReportsController.cs
index 6a3a18ac..ea1d32d5 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/ReportsController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/ReportsController.cs
@@ -2,7 +2,6 @@
 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;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/StatisticsController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/StatisticsController.cs
index 31bc9a7d..219e1f44 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/StatisticsController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/StatisticsController.cs
@@ -1,13 +1,10 @@
-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.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;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
diff --git a/src/BUTR.Site.NexusMods.Server/Controllers/SteamController.cs b/src/BUTR.Site.NexusMods.Server/Controllers/SteamController.cs
index b454ccc1..edbacc53 100644
--- a/src/BUTR.Site.NexusMods.Server/Controllers/SteamController.cs
+++ b/src/BUTR.Site.NexusMods.Server/Controllers/SteamController.cs
@@ -1,4 +1,3 @@
-using BUTR.Authentication.NexusMods.Authentication;
 using BUTR.Site.NexusMods.Server.Extensions;
 using BUTR.Site.NexusMods.Server.Models;
 using BUTR.Site.NexusMods.Server.Options;
@@ -8,7 +7,6 @@
 using BUTR.Site.NexusMods.Server.Utils.BindingSources;
 using BUTR.Site.NexusMods.Shared.Helpers;
 
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
diff --git a/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicFilterBuilder.cs b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicFilterBuilder.cs
index 5060bf6b..b5c008e1 100644
--- a/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicFilterBuilder.cs
+++ b/src/BUTR.Site.NexusMods.Server/DynamicExpressions/DynamicFilterBuilder.cs
@@ -50,10 +50,7 @@ public DynamicFilterBuilder<TEntity> Or(Action<DynamicFilterBuilder<TEntity>> ac
         return this;
     }
 
-    public Expression<Func<TEntity, bool>> Build()
-    {
-        return Expression.Lambda<Func<TEntity, bool>>(Expression, _param);
-    }
+    public Expression<Func<TEntity, bool>> Build() => 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/Extensions/IAsyncEnumerableExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/IAsyncEnumerableExtensions.cs
index 2db42d28..1942d2cf 100644
--- a/src/BUTR.Site.NexusMods.Server/Extensions/IAsyncEnumerableExtensions.cs
+++ b/src/BUTR.Site.NexusMods.Server/Extensions/IAsyncEnumerableExtensions.cs
@@ -9,9 +9,9 @@ namespace BUTR.Site.NexusMods.Server.Extensions;
 
 public static class IAsyncEnumerableExtensions
 {
-    private static ConfiguredCancelableAsyncEnumerable<T>.Enumerator GetConfiguredAsyncEnumerator<T>(this IAsyncEnumerable<T> enumerable, CancellationToken cancellationToken, bool continueOnCapturedContext)
+    private static ConfiguredCancelableAsyncEnumerable<T>.Enumerator GetConfiguredAsyncEnumerator<T>(this IAsyncEnumerable<T> enumerable, CancellationToken ct, bool continueOnCapturedContext)
     {
-        return enumerable.ConfigureAwait(continueOnCapturedContext).WithCancellation(cancellationToken).GetAsyncEnumerator();
+        return enumerable.ConfigureAwait(continueOnCapturedContext).WithCancellation(ct).GetAsyncEnumerator();
     }
 
     public static async Task<ImmutableArray<TSource>> ToImmutableArrayAsync<TSource>(this IAsyncEnumerable<TSource> source, CancellationToken ct = default)
diff --git a/src/BUTR.Site.NexusMods.Server/Extensions/JobExecutionContextExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/JobExecutionContextExtensions.cs
index 6d898645..db281aec 100644
--- a/src/BUTR.Site.NexusMods.Server/Extensions/JobExecutionContextExtensions.cs
+++ b/src/BUTR.Site.NexusMods.Server/Extensions/JobExecutionContextExtensions.cs
@@ -1,4 +1,3 @@
-using BUTR.Site.NexusMods.Server.Utils;
 using BUTR.Site.NexusMods.Server.Utils.Quartz;
 
 using Quartz;
diff --git a/src/BUTR.Site.NexusMods.Server/Extensions/QueryableExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/QueryableExtensions.cs
index 2e4fcad6..373248df 100644
--- a/src/BUTR.Site.NexusMods.Server/Extensions/QueryableExtensions.cs
+++ b/src/BUTR.Site.NexusMods.Server/Extensions/QueryableExtensions.cs
@@ -2,8 +2,8 @@
 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.Npgsql;
-using BUTR.Site.NexusMods.Server.Utils.Vogen;
 
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
@@ -108,11 +108,7 @@ 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;
-        }
+        type = QueryableHelper.ConvertValueObject(type);
 
         if (type.IsEnum)
             return Enum.TryParse(type, rawValue, out value);
diff --git a/src/BUTR.Site.NexusMods.Server/Extensions/VogenExtensions.cs b/src/BUTR.Site.NexusMods.Server/Extensions/VogenExtensions.cs
deleted file mode 100644
index 941316c7..00000000
--- a/src/BUTR.Site.NexusMods.Server/Extensions/VogenExtensions.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-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/Models/API/PagingData.cs b/src/BUTR.Site.NexusMods.Server/Models/API/PagingData.cs
index 9619cea1..1872d2d6 100644
--- a/src/BUTR.Site.NexusMods.Server/Models/API/PagingData.cs
+++ b/src/BUTR.Site.NexusMods.Server/Models/API/PagingData.cs
@@ -66,7 +66,7 @@ public async ValueTask<bool> MoveNextAsync()
 
         public AsyncEnumerableWrapper(IAsyncEnumerable<T> inner, Action onLastItem) => (_inner, _onLastItem) = (inner, onLastItem);
 
-        public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default) => new AsyncEnumeratorWrapper(_inner.GetAsyncEnumerator(cancellationToken), _onLastItem);
+        public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken ct = default) => new AsyncEnumeratorWrapper(_inner.GetAsyncEnumerator(ct), _onLastItem);
     }
 
     [JsonIgnore]
diff --git a/src/BUTR.Site.NexusMods.Server/Options/NexusModsOptions.cs b/src/BUTR.Site.NexusMods.Server/Options/NexusModsOptions.cs
index bfe1e64b..6c48c180 100644
--- a/src/BUTR.Site.NexusMods.Server/Options/NexusModsOptions.cs
+++ b/src/BUTR.Site.NexusMods.Server/Options/NexusModsOptions.cs
@@ -16,5 +16,5 @@ public NexusModsOptionsValidator(HttpClient client)
 
 public sealed record NexusModsOptions
 {
-    public required NexusModsApiKey ApiKey { get; init; }
+    public required NexusModsApiKey ApiKey { get; init; } = NexusModsApiKey.None;
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Server/Services/CrashReportBatchedHandler.cs b/src/BUTR.Site.NexusMods.Server/Services/CrashReportBatchedHandler.cs
index 6ab46b54..a1cf20ad 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/CrashReportBatchedHandler.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/CrashReportBatchedHandler.cs
@@ -28,14 +28,14 @@ private record HttpResultEntry(CrashReportFileId FileId, DateTime Date, CrashRep
 
     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)}
-         """;
+{(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);
diff --git a/src/BUTR.Site.NexusMods.Server/Services/HttpClients/NexusModsAPIClient.cs b/src/BUTR.Site.NexusMods.Server/Services/HttpClients/NexusModsAPIClient.cs
index b007f5c2..c2140ef3 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/HttpClients/NexusModsAPIClient.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/HttpClients/NexusModsAPIClient.cs
@@ -165,7 +165,7 @@ private static string HashString(string value)
                 _lock.Release();
             }
         }
-        catch (Exception e)
+        catch (Exception)
         {
             await _cache.RemoveAsync(key, ct);
             return null;
diff --git a/src/BUTR.Site.NexusMods.Server/Services/BannerlordBinaryCache.cs b/src/BUTR.Site.NexusMods.Server/Services/SteamBinaryCache.cs
similarity index 87%
rename from src/BUTR.Site.NexusMods.Server/Services/BannerlordBinaryCache.cs
rename to src/BUTR.Site.NexusMods.Server/Services/SteamBinaryCache.cs
index e2016d21..b6bbd84b 100644
--- a/src/BUTR.Site.NexusMods.Server/Services/BannerlordBinaryCache.cs
+++ b/src/BUTR.Site.NexusMods.Server/Services/SteamBinaryCache.cs
@@ -12,13 +12,13 @@
 
 namespace BUTR.Site.NexusMods.Server.Services;
 
-public sealed class BannerlordBinaryCache
+public sealed class SteamBinaryCache
 {
     private readonly SteamDepotDownloader _steamDepotDownloader;
     private readonly SteamDepotDownloaderOptions _options;
     private readonly IDistributedCache _distributedCache;
 
-    public BannerlordBinaryCache(SteamDepotDownloader steamDepotDownloader, IOptions<SteamDepotDownloaderOptions> options, IDistributedCache distributedCache)
+    public SteamBinaryCache(SteamDepotDownloader steamDepotDownloader, IOptions<SteamDepotDownloaderOptions> options, IDistributedCache distributedCache)
     {
         _steamDepotDownloader = steamDepotDownloader;
         _options = options.Value;
diff --git a/src/BUTR.Site.NexusMods.Server/Startup.cs b/src/BUTR.Site.NexusMods.Server/Startup.cs
index a0eded7b..db848a52 100644
--- a/src/BUTR.Site.NexusMods.Server/Startup.cs
+++ b/src/BUTR.Site.NexusMods.Server/Startup.cs
@@ -4,9 +4,9 @@
 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;
 using BUTR.Site.NexusMods.Server.Models.API;
 using BUTR.Site.NexusMods.Server.Options;
 using BUTR.Site.NexusMods.Server.Services;
@@ -15,7 +15,6 @@
 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;
 
@@ -54,7 +53,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Unicode;
-using System.Threading.Tasks;
 
 namespace BUTR.Site.NexusMods.Server;
 
@@ -166,7 +164,7 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddMultipartSupport();
 
-        services.AddSingleton<BannerlordBinaryCache>();
+        services.AddSingleton<SteamBinaryCache>();
         services.AddSingleton<SteamDepotDownloader>();
 
         services.AddSingleton<QuartzEventProviderService>();
@@ -184,8 +182,9 @@ public void ConfigureServices(IServiceCollection services)
             opt.AddJob<CrashReportProcessorJob>();
             opt.AddJob<CrashReportAnalyzerProcessorJob>();
             opt.AddJob<TopExceptionsTypesAnalyzerProcessorJob>();
-            opt.AddJob<AutocompleteProcessorProcessorJob>();
+            opt.AddJobAtStartup<AutocompleteProcessorProcessorJob>();
             opt.AddJob<NexusModsModFileProcessorJob>();
+            //opt.AddJobAtStartup<NexusModsModFileProcessorJob>();
             opt.AddJob<NexusModsModFileUpdatesProcessorJob>();
             opt.AddJob<NexusModsArticleProcessorJob>();
             opt.AddJob<NexusModsArticleUpdatesProcessorJob>();
@@ -209,19 +208,20 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddMemoryCache();
 
-        services.AddSingleton<ITenantContextAccessor, TenantContextAccessor>();
-        
-        services.AddSingleton<IEntityConfigurationFactory, EntityConfigurationFactory>();
+        services.AddScoped<ITenantContextAccessor, TenantContextAccessor>();
+
+        services.AddScoped<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.AddSingleton(typeof(BaseEntityConfigurationWithTenant<>).MakeGenericType(type.BaseType!.GetGenericArguments()), type);
+            services.TryAddEnumerable(ServiceDescriptor.Scoped(typeof(IEntityConfiguration), type));
         foreach (var type in types.Where(x => x.BaseType!.GetGenericTypeDefinition() == typeof(BaseEntityConfiguration<>)))
-            services.AddSingleton(typeof(BaseEntityConfiguration<>).MakeGenericType(type.BaseType!.GetGenericArguments()), type);
-
+            services.TryAddEnumerable(ServiceDescriptor.Scoped(typeof(IEntityConfiguration), type));
+        
+        services.AddSingleton<NpgsqlDataSourceProvider>();
         services.AddDbContext<BaseAppDbContext>(ServiceLifetime.Scoped);
-        services.AddDbContextFactory<AppDbContextRead>( lifetime: ServiceLifetime.Singleton);
-        services.AddDbContextFactory<AppDbContextWrite>(lifetime: ServiceLifetime.Singleton);
-        services.AddSingleton<IAppDbContextFactory, AppDbContextFactory>();
+        services.AddDbContextFactory<AppDbContextRead>(lifetime: ServiceLifetime.Scoped);
+        services.AddDbContextFactory<AppDbContextWrite>(lifetime: ServiceLifetime.Scoped);
+        services.AddScoped<IAppDbContextFactory, AppDbContextFactory>();
         services.AddScoped<IAppDbContextRead>(sp => sp.GetRequiredService<IAppDbContextFactory>().CreateRead());
         services.AddScoped<IAppDbContextWrite>(sp => sp.GetRequiredService<IAppDbContextFactory>().CreateWrite());
 
@@ -319,7 +319,7 @@ public void ConfigureServices(IServiceCollection services)
             opt.OperationFilter<BindIgnoreFilter>();
             opt.OperationFilter<AuthResponsesOperationFilter>();
             opt.OperationFilter<APIResponseOperationFilter>();
-            opt.SchemaFilter<VogenSchemaFilter>();
+            opt.ValueObjectFilter();
 
             // Really .NET?
             opt.MapType<TimeSpan>(() => new OpenApiSchema { Type = "string", Format = "time-span" });
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/IBindIgnore.cs b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/IBindIgnore.cs
index b82ff59b..293b59d7 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/IBindIgnore.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BindingSources/IBindIgnore.cs
@@ -1,3 +1,3 @@
 namespace BUTR.Site.NexusMods.Server.Utils.BindingSources;
 
-public interface IBindIgnore { }
\ No newline at end of file
+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 a33974bc..e3bd16ad 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/BlockUntilDateConstraint.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/BlockUntilDateConstraint.cs
@@ -21,16 +21,16 @@ public BlockUntilDateConstraint(DateTime blockUntil)
         _blockUntil = blockUntil;
     }
 
-    public async Task<IDisposable> WaitForReadiness(CancellationToken cancellationToken)
+    public async Task<IDisposable> WaitForReadiness(CancellationToken ct)
     {
-        await _semaphore.WaitAsync(cancellationToken);
+        await _semaphore.WaitAsync(ct);
         var timeToWait = _blockUntil - DateTime.Now;
         if (timeToWait < TimeSpan.Zero)
             return new DummyDisposable();
 
         try
         {
-            await Task.Delay(timeToWait, cancellationToken);
+            await Task.Delay(timeToWait, ct);
             return new DummyDisposable();
         }
         finally
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 1342c9fb..5d5c9c5f 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingHttpMessageHandler.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingHttpMessageHandler.cs
@@ -40,11 +40,11 @@ public SyncLoggingHttpMessageHandler(ILogger logger, HttpClientFactoryOptions op
         _options = options ?? throw new ArgumentNullException(nameof(options));
     }
 
-    protected override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken cancellationToken)
+    protected override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken ct)
     {
-        return Core(request, cancellationToken);
+        return Core(request, ct);
 
-        HttpResponseMessage Core(HttpRequestMessage request, CancellationToken cancellationToken)
+        HttpResponseMessage Core(HttpRequestMessage request, CancellationToken ct)
         {
             var shouldRedactHeaderValue = _options?.ShouldRedactHeaderValue ?? _shouldNotRedactHeaderValue;
 
@@ -52,7 +52,7 @@ HttpResponseMessage Core(HttpRequestMessage request, CancellationToken cancellat
             // not really anything to surround.
             Log.RequestStart(_logger, request, shouldRedactHeaderValue);
             var stopwatch = Stopwatch.StartNew();
-            var response = base.Send(request, cancellationToken);
+            var response = base.Send(request, ct);
             Log.RequestEnd(_logger, response, stopwatch.Elapsed, shouldRedactHeaderValue);
 
             return response;
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 1e13559b..cf26813e 100644
--- a/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingScopeHttpMessageHandler.cs
+++ b/src/BUTR.Site.NexusMods.Server/Utils/Http/Logging/SyncLoggingScopeHttpMessageHandler.cs
@@ -40,11 +40,11 @@ public SyncLoggingScopeHttpMessageHandler(ILogger logger, HttpClientFactoryOptio
         _options = options ?? throw new ArgumentNullException(nameof(options));
     }
 
-    protected override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken cancellationToken)
+    protected override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken ct)
     {
-        return Core(request, cancellationToken);
+        return Core(request, ct);
 
-        HttpResponseMessage Core(HttpRequestMessage request, CancellationToken cancellationToken)
+        HttpResponseMessage Core(HttpRequestMessage request, CancellationToken ct)
         {
             var stopwatch = Stopwatch.StartNew();
 
@@ -53,7 +53,7 @@ HttpResponseMessage Core(HttpRequestMessage request, CancellationToken cancellat
             using (Log.BeginRequestPipelineScope(_logger, request))
             {
                 Log.RequestPipelineStart(_logger, request, shouldRedactHeaderValue);
-                var response = base.Send(request, cancellationToken);
+                var response = base.Send(request, ct);
                 Log.RequestPipelineEnd(_logger, response, stopwatch.Elapsed, shouldRedactHeaderValue);
 
                 return response;
diff --git a/src/BUTR.Site.NexusMods.Server/Utils/Npgsql/ImmutableArrayToArrayConverter.cs b/src/BUTR.Site.NexusMods.Server/Utils/Npgsql/ImmutableArrayToArrayConverter.cs
deleted file mode 100644
index 257b479a..00000000
--- a/src/BUTR.Site.NexusMods.Server/Utils/Npgsql/ImmutableArrayToArrayConverter.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.ValueConversion;
-
-using System.Collections.Immutable;
-using System.Runtime.CompilerServices;
-
-namespace BUTR.Site.NexusMods.Server.Utils.Npgsql;
-
-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);
-
-    public ValueConverter ElementConverter => new ValueConverter<T, T>(x => x, x => x);
-
-    public ImmutableArrayToArrayConverter() : base(x => ToArray(x), x => ToImmutableArray(x)) { }
-}
\ 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
deleted file mode 100644
index 91b6c608..00000000
--- a/src/BUTR.Site.NexusMods.Server/Utils/Vogen/IVogen.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-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.ServerClient/Clients.cs b/src/BUTR.Site.NexusMods.ServerClient/Clients.cs
index 70bbe399..dbddc4bd 100644
--- a/src/BUTR.Site.NexusMods.ServerClient/Clients.cs
+++ b/src/BUTR.Site.NexusMods.ServerClient/Clients.cs
@@ -22,7 +22,7 @@ public AuthenticationClient(HttpClient client, JsonSerializerOptions options) :
 
 public partial interface ICrashReportsClient
 {
-    Task<PagingStreamingData<CrashReportModel2>> PaginatedStreamingAsync(PaginatedQuery? body = null, CancellationToken cancellationToken = default);
+    Task<PagingStreamingData<CrashReportModel2>> PaginatedStreamingAsync(PaginatedQuery? body = null, CancellationToken ct = default);
 }
 
 public partial class CrashReportsClient
@@ -39,7 +39,7 @@ partial void PrepareRequest(HttpClient client, HttpRequestMessage request, Strin
         OnPrepareRequest(client, request, urlBuilder);
     }
 
-    public virtual async Task<PagingStreamingData<CrashReportModel2>> PaginatedStreamingAsync(PaginatedQuery? body = null, CancellationToken cancellationToken = default)
+    public virtual async Task<PagingStreamingData<CrashReportModel2>> PaginatedStreamingAsync(PaginatedQuery? body = null, CancellationToken ct = default)
     {
         var urlBuilder_ = new StringBuilder();
         urlBuilder_.Append("api/v1/CrashReports/PaginatedStreaming");
@@ -60,7 +60,7 @@ public virtual async Task<PagingStreamingData<CrashReportModel2>> PaginatedStrea
 
             PrepareRequest(client_, request_, url_);
 
-            var response_ = await client_.SendAsync(request_, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
+            var response_ = await client_.SendAsync(request_, HttpCompletionOption.ResponseHeadersRead, ct).ConfigureAwait(false);
             var disposeResponse_ = true;
             try
             {
@@ -80,7 +80,7 @@ public virtual async Task<PagingStreamingData<CrashReportModel2>> PaginatedStrea
                     {
                         try
                         {
-                            var pagingStreamingData = PagingStreamingData<CrashReportModel2>.Create(response_, JsonSerializerSettings, cancellationToken);
+                            var pagingStreamingData = PagingStreamingData<CrashReportModel2>.Create(response_, JsonSerializerSettings, ct);
                             disposeResponse_ = false;
                             return pagingStreamingData;
                         }
@@ -92,17 +92,17 @@ public virtual async Task<PagingStreamingData<CrashReportModel2>> PaginatedStrea
                     }
                     case HttpStatusCode.Unauthorized:
                     {
-                        var responseText_ = response_.Content == null! ? string.Empty : await response_.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+                        var responseText_ = response_.Content == null! ? string.Empty : await response_.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
                         throw new ApiException("User not authenticated.", status_, responseText_, headers_, null);
                     }
                     case HttpStatusCode.Forbidden:
                     {
-                        var responseText_ = response_.Content == null! ? string.Empty : await response_.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+                        var responseText_ = response_.Content == null! ? string.Empty : await response_.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
                         throw new ApiException("User not authorized to access this endpoint.", status_, responseText_, headers_, null);
                     }
                     default:
                     {
-                        var responseData_ = response_.Content == null! ? null : await response_.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+                        var responseData_ = response_.Content == null! ? null : await response_.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
                         throw new ApiException($"The HTTP status code of the response was not expected ({status_}).", status_, responseData_, headers_, null);
                     }
                 }
diff --git a/src/BUTR.Site.NexusMods.ServerClient/Utils/OneTimeEnumerable.cs b/src/BUTR.Site.NexusMods.ServerClient/Utils/OneTimeEnumerable.cs
index a78c092b..c5b87c72 100644
--- a/src/BUTR.Site.NexusMods.ServerClient/Utils/OneTimeEnumerable.cs
+++ b/src/BUTR.Site.NexusMods.ServerClient/Utils/OneTimeEnumerable.cs
@@ -34,5 +34,5 @@ public OneTimeEnumerable(IAsyncEnumerable<T> inner)
         _enumerator = new OneTimeEnumerator(inner.GetAsyncEnumerator(), () => Enumeration.SetResult());
     }
 
-    public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default) => _enumerator;
+    public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken ct = default) => _enumerator;
 }
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.ServerClient/Utils/PagingStreamingData.cs b/src/BUTR.Site.NexusMods.ServerClient/Utils/PagingStreamingData.cs
index da59d82d..49ad46f0 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(null));
+        LazyTask<APIStreamingResponse> GetStatusAsync() => LazyTask<APIStreamingResponse>.FromResult(new APIStreamingResponse(default!));
         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(null));
+        LazyTask<APIStreamingResponse> GetStatusAsync() => LazyTask<APIStreamingResponse>.FromResult(new APIStreamingResponse(default!));
         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.Error?.Detail);
+            hasError = result is null || !string.IsNullOrEmpty(result.Error.Detail);
             return result!;
         }
         async LazyTask<PagingMetadata> GetMetadataAsync()
diff --git a/src/BUTR.Site.NexusMods.ServerClient/Utils/StreamWithLfEnding.cs b/src/BUTR.Site.NexusMods.ServerClient/Utils/StreamWithLfEnding.cs
index d6e555e1..c827c674 100644
--- a/src/BUTR.Site.NexusMods.ServerClient/Utils/StreamWithLfEnding.cs
+++ b/src/BUTR.Site.NexusMods.ServerClient/Utils/StreamWithLfEnding.cs
@@ -11,7 +11,7 @@ internal sealed partial class StreamWithLfEnding : Stream
     private static readonly byte[] Lf = "\n"u8.ToArray();
 
     private readonly Stream _streamImplementation;
-    private bool _endRead = false;
+    private bool _endRead;
 
     public IMemoryOwner<byte>? _leftoverBytes;
     public int _leftoverBytesLength;
@@ -28,7 +28,7 @@ public StreamWithLfEnding(IMemoryOwner<byte> leftoverBytes, int leftoverBytesLen
     }
 
     public override int Read(byte[] buffer, int offset, int count) => _streamImplementation.Read(buffer, offset, count);
-    public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
+    public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken ct = default)
     {
         if (_endRead) return 0;
 
@@ -45,7 +45,7 @@ public override async ValueTask<int> ReadAsync(Memory<byte> buffer, Cancellation
         }
         else
         {
-            length = await _streamImplementation.ReadAsync(buffer, cancellationToken);
+            length = await _streamImplementation.ReadAsync(buffer, ct);
             var memory = buffer.Slice(0, length);
             if (memory.Span.IndexOfAny(Lf) is not (var idx and not -1)) return length;
             lfIdx = idx;
diff --git a/src/BUTR.Site.NexusMods.Shared/BUTR.Site.NexusMods.Shared.csproj.DotSettings b/src/BUTR.Site.NexusMods.Shared/BUTR.Site.NexusMods.Shared.csproj.DotSettings
new file mode 100644
index 00000000..c2b13115
--- /dev/null
+++ b/src/BUTR.Site.NexusMods.Shared/BUTR.Site.NexusMods.Shared.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=reflection/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/BUTR.Site.NexusMods.Shared/Helpers/NexusModsUtils.cs b/src/BUTR.Site.NexusMods.Shared/Helpers/NexusModsUtils.cs
index 4a996bc8..e9e2cbd8 100644
--- a/src/BUTR.Site.NexusMods.Shared/Helpers/NexusModsUtils.cs
+++ b/src/BUTR.Site.NexusMods.Shared/Helpers/NexusModsUtils.cs
@@ -5,11 +5,14 @@ namespace BUTR.Site.NexusMods.Shared.Helpers;
 
 public static class NexusModsUtils
 {
-    public static bool TryParse(string url, [NotNullWhen(true)] out string? gameDomain, out uint modId)
+    public static bool TryParse(string? url, [NotNullWhen(true)] out string? gameDomain, out uint modId)
     {
         gameDomain = default;
         modId = default;
 
+        if (url is null)
+            return false;
+
         if (!url.Contains("nexusmods.com/"))
             return false;
 
diff --git a/src/nuget.config b/src/nuget.config
index fb3f59b9..eb3fc3b2 100644
--- a/src/nuget.config
+++ b/src/nuget.config
@@ -4,7 +4,6 @@
     <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>