diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs
index a8b1e94c5..4442bbc8a 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs
@@ -6,6 +6,7 @@
     using LearningHub.Nhs.Models.Entities.Analytics;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Extensions;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
     using Newtonsoft.Json;
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs
index 86c3b8cde..c3a6367e6 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs
@@ -12,6 +12,7 @@
     using LearningHub.Nhs.Models.Extensions;
     using LearningHub.Nhs.Models.Maintenance;
     using LearningHub.Nhs.Models.Paging;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Options;
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs b/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs
index 3e07e56f7..2b2b898cf 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs
@@ -4,6 +4,7 @@
     using LearningHub.Nhs.AdminUI.Helpers;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Extensions;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Mvc.Filters;
 
     /// <summary>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 8dc230357..889633f05 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -83,13 +83,13 @@
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
 		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
 		<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="FluentValidation" Version="11.11.0" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs
index 8a7502cb7..cc1aaf00e 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs
@@ -3,6 +3,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.AdminUI.Extensions;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Primitives;
 
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs
index 377771ff4..146aabde8 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs
@@ -1,7 +1,7 @@
 namespace LearningHub.Nhs.AdminUI.Models
 {
     using System.ComponentModel.DataAnnotations;
-    using LearningHub.Nhs.Models.Binders;
+    using LearningHub.Nhs.Caching.Binders;
 
     /// <summary>
     /// Defines the <see cref="ContactViewModel" />.
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
index 1039a3673..10a3e8137 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
@@ -21,6 +21,7 @@
     using LearningHub.Nhs.Models.Automapper;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Extensions;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Authentication;
     using Microsoft.AspNetCore.Authentication.Cookies;
     using Microsoft.AspNetCore.Authentication.OpenIdConnect;
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs
index 00cd33837..5050690a6 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs
@@ -10,6 +10,7 @@
     using LearningHub.Nhs.AdminUI.Configuration;
     using LearningHub.Nhs.AdminUI.Extensions;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Authentication;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs
index 48ff81cb6..9e3489f45 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs
@@ -4,6 +4,7 @@
     using LearningHub.Nhs.AdminUI.Configuration;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs
index 5e8463cad..c0ae5b67c 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/OpenApiHttpClient.cs
@@ -4,6 +4,7 @@
     using LearningHub.Nhs.AdminUI.Configuration;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs
index cfdc4050b..0691fe097 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs
@@ -12,6 +12,7 @@
     using LearningHub.Nhs.Models.Common;
     using LearningHub.Nhs.Models.Provider;
     using LearningHub.Nhs.Models.Validation;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Newtonsoft.Json;
 
     /// <summary>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs
index 7b435cca0..e2c1f2fab 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs
@@ -7,6 +7,7 @@
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.User;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
 
     /// <summary>
     /// The role service.
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs
index 5af8f9bec..3fe33eaf9 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs
@@ -4,6 +4,7 @@
     using LearningHub.Nhs.AdminUI.Configuration;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs
index 0a941c761..e17942e90 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs
@@ -16,6 +16,7 @@ namespace LearningHub.Nhs.AdminUI.Services
     using LearningHub.Nhs.Models.Paging;
     using LearningHub.Nhs.Models.User;
     using LearningHub.Nhs.Models.Validation;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Microsoft.AspNetCore.Http;
     using Newtonsoft.Json;
 
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs
index c84dbc2f2..85b82b2a7 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs
@@ -17,6 +17,7 @@
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.Models.User;
     using LearningHub.Nhs.Models.Validation;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using Newtonsoft.Json;
 
     /// <summary>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml
index 56ff582ff..3097a8e08 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml
@@ -1,6 +1,6 @@
 @using LearningHub.Nhs.AdminUI.Extensions
 @using LearningHub.Nhs.AdminUI.Middleware
-@inject LearningHub.Nhs.Caching.ICacheService cacheService
+@inject LearningHub.Nhs.Models.WebUtilitiesInterfaces.ICacheService cacheService
 
 @if (User.Identity.IsAuthenticated)
 {
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 59413f8ea..6d444b09a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -8,10 +8,9 @@
 
 	<ItemGroup>
 
-		<PackageVersion Include="elfhHub.Nhs.Models" Version="3.0.9" />
+		<PackageVersion Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageVersion Include="GDS.MultiPageFormData" Version="1.0.6" />
-		<PackageVersion Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageVersion Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageVersion Include="LearningHub.Nhs.Caching" Version="3.0.0" />
 		<PackageVersion Include="UK.NHS.CookieBanner" Version="2.0.7" />
 
 		<PackageVersion Include="AngleSharp" Version="0.16.1" />
@@ -28,7 +27,7 @@
 		<PackageVersion Include="coverlet.collector" Version="6.0.4" />
 		<PackageVersion Include="EntityFrameworkCore.Testing.Moq" Version="9.0.1" />
 		<PackageVersion Include="FluentAssertions" Version="6.12.0" />
-		<PackageVersion Include="FluentValidation" Version="12.0.0" />
+		<PackageVersion Include="FluentValidation" Version="11.11.0" />
 		<PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.1" />
 		<PackageVersion Include="HtmlAgilityPack" Version="1.12.1" />
 		<PackageVersion Include="HtmlSanitizer" Version="6.0.453" />
diff --git a/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs b/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs
index c65fe674b..a9ae40996 100644
--- a/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs
+++ b/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs
@@ -1,5 +1,8 @@
-namespace LearningHub.Nhs.Shared.Interfaces.Http
+using System.Net.Http;
+namespace LearningHub.Nhs.Shared.Interfaces.Http
 {
+    using System.Threading.Tasks;
+
     /// <summary>
     /// Represents an HTTP client for a specific API.
     /// </summary>
diff --git a/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj b/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj
index d51462771..65998ee57 100644
--- a/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj
+++ b/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj
@@ -1,16 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
+	<!--Shared needs to be agnostic so uses netstandard 2.1 so can be widely consumed as it has maximum compatibility-->
+	<TargetFrameworks>netstandard2.1</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
+	<Target Name="CheckForIncompatiblePackages" BeforeTargets="Restore">
+		<ItemGroup>
+			<IncompatiblePackages Include="Microsoft.AspNetCore.Mvc;Microsoft.AspNetCore.App;System.Web;Microsoft.EntityFrameworkCore" />
+		</ItemGroup>
+		<Error Condition="'%(PackageReference.Identity)' != '' and '@(IncompatiblePackages->'%(Identity)')' == '%(PackageReference.Identity)'" Text="Incompatible package '%(PackageReference.Identity)' detected. Use .NET Standard 2.0-compatible packages for Blazor WASM compatibility." />
+	</Target>
 	<ItemGroup>
-	  <Folder Include="Models\Contribute\" />
-	  <Folder Include="Models\Paging\" />
+		<Folder Include="Models\Contribute\" />
+		<Folder Include="Models\Paging\" />
+	</ItemGroup>
+	<ItemGroup>
+	  <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 	</ItemGroup>
 
-</Project>
-
-
+</Project>
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI.BlazorClient/Program.cs b/LearningHub.Nhs.WebUI.BlazorClient/Program.cs
index c65aca1ab..e98372c63 100644
--- a/LearningHub.Nhs.WebUI.BlazorClient/Program.cs
+++ b/LearningHub.Nhs.WebUI.BlazorClient/Program.cs
@@ -24,6 +24,7 @@
 using TELBlazor.Components.Core.Configuration;
 using TELBlazor.Components.Core.Services.HelperServices;
 using TELBlazor.Components.OptionalImplementations.Core.Services.HelperServices;
+using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
@@ -88,7 +89,7 @@
     builder.Services.AddScoped<LoggingLevelSwitch>(sp => levelSwitch);
     builder.Services.AddScoped<ILogLevelSwitcherService, SerilogLogLevelSwitcherService>();
 
-    // TODO (QQQQ) implement post TD-5925 builder.Services.AddScoped<ICacheService, WasmCacheServiceStub>();
+    builder.Services.AddScoped<ICacheService, WasmCacheServiceStub>();
 
     await builder.Build().RunAsync();
 }
diff --git a/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs b/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs
index 6083581c2..1bd244f25 100644
--- a/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs
+++ b/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs
@@ -1,4 +1,4 @@
-// TODO (QQQQ) implement post TD-5925: using LearningHub.Nhs.Models;
+using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
 
 namespace LearningHub.Nhs.WebUI.BlazorClient.Services
 {
@@ -6,7 +6,7 @@ namespace LearningHub.Nhs.WebUI.BlazorClient.Services
     /// We may use storage, we may just stub it and throw an error, we cant directly use redis we may access it via an api
     /// The cachestub currently just returns there is nothing available so the caller then will revert to calling the api.
     /// </summary>
-    public class WasmCacheServiceStub // TODO (QQQQ) implement post TD-5925 and get from NHS.Models: ICacheService
+    public class WasmCacheServiceStub : ICacheService
     {
         public Task<T> GetAsync<T>(string key)
         {
diff --git a/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj b/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj
index fa71b7ae6..68453347a 100644
--- a/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj
+++ b/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj
@@ -1,9 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+	  <!--Shared needs to be agnostic so uses netstandard 2.1 so can be widely consumed as it has maximum compatibility-->
+	  <TargetFrameworks>netstandard2.1</TargetFrameworks>
+	  <Nullable>enable</Nullable>
   </PropertyGroup>
+  <Target Name="CheckForIncompatiblePackages" BeforeTargets="Restore">
+	  <ItemGroup>
+		  <IncompatiblePackages Include="Microsoft.AspNetCore.Mvc;Microsoft.AspNetCore.App;System.Web;Microsoft.EntityFrameworkCore" />
+	  </ItemGroup>
+	  <Error Condition="'%(PackageReference.Identity)' != '' and '@(IncompatiblePackages->'%(Identity)')' == '%(PackageReference.Identity)'" Text="Incompatible package '%(PackageReference.Identity)' detected. Use .NET Standard 2.0-compatible packages for Blazor WASM compatibility." />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
+  </ItemGroup>
 
 </Project>
diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index 2d2017cd2..16383bf33 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -14,6 +14,7 @@
     using GDS.MultiPageFormData.Enums;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Common;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Extensions;
     using LearningHub.Nhs.WebUI.Filters;
diff --git a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
index 12d9973ac..1804c5389 100644
--- a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
@@ -13,6 +13,7 @@
     using LearningHub.Nhs.Models.Hierarchy;
     using LearningHub.Nhs.Models.Search;
     using LearningHub.Nhs.Models.User;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Filters;
     using LearningHub.Nhs.WebUI.Interfaces;
diff --git a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
index fab43e688..8cb4795ec 100644
--- a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
@@ -1,16 +1,12 @@
 namespace LearningHub.Nhs.WebUI.Controllers
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using elfhHub.Nhs.Models.Common;
     using elfhHub.Nhs.Models.Entities;
     using elfhHub.Nhs.Models.Enums;
     using GDS.MultiPageFormData;
     using GDS.MultiPageFormData.Enums;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Filters;
     using LearningHub.Nhs.WebUI.Helpers;
@@ -19,6 +15,7 @@
     using LearningHub.Nhs.WebUI.Models.UserProfile;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Routing;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
@@ -309,7 +306,7 @@ public async Task<IActionResult> SelectSecurityQuestion(int questionIndex, strin
 
             var viewModel = new SecurityQuestionSelectViewModel
             {
-                SecurityQuestions = securityViewModel.SecurityQuestions,
+                SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
                 QuestionIndex = questionIndex,
                 SelectedSecurityQuestionId = userQuestion.SecurityQuestionId,
             };
@@ -360,7 +357,7 @@ public async Task<IActionResult> SelectSecurityQuestionPost(SecurityQuestionSele
             {
                 var viewModel = new SecurityQuestionSelectViewModel
                 {
-                    SecurityQuestions = securityViewModel.SecurityQuestions,
+                    SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
                     QuestionIndex = model.QuestionIndex,
                 };
 
@@ -426,7 +423,7 @@ public async Task<IActionResult> AnswerSecurityQuestionPost(SecurityQuestionAnsw
             {
                 var viewModel = new SecurityQuestionSelectViewModel
                 {
-                    SecurityQuestions = securityViewModel.SecurityQuestions,
+                    SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
                     QuestionIndex = model.QuestionIndex,
                 };
 
diff --git a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
index d1dadb902..b16547f15 100644
--- a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
@@ -11,6 +11,7 @@
     using GDS.MultiPageFormData;
     using GDS.MultiPageFormData.Enums;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Helpers;
     using LearningHub.Nhs.WebUI.Interfaces;
@@ -20,6 +21,7 @@
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Routing;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Logging;
@@ -299,7 +301,8 @@ public async Task<IActionResult> SecurityQuestionsDetails(int questionIndex)
         {
             SecurityQuestionSelectViewModel securityViewModel = new SecurityQuestionSelectViewModel();
             var model = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId);
-            securityViewModel.SecurityQuestions = model.SecurityQuestions;
+
+            securityViewModel.SecurityQuestions = model.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList();
             securityViewModel.QuestionIndex = questionIndex;
             securityViewModel.SelectedSecurityQuestionId = model.UserSecurityQuestions.ElementAt(questionIndex).SecurityQuestionId;
             return this.View("SecurityQuestionsDetails", securityViewModel);
@@ -505,7 +508,7 @@ public async Task<IActionResult> ValidateSecurityQuestion(SecurityQuestionSelect
         {
             bool duplicatesExist = false;
             var securityQuestionsViewModel = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId);
-            model.SecurityQuestions = securityQuestionsViewModel.SecurityQuestions;
+            model.SecurityQuestions = securityQuestionsViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList();
 
             if (model.QuestionIndex == 0)
             {
diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index 5df61185e..38e32f378 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -11,6 +11,7 @@
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.Models.Resource.Activity;
     using LearningHub.Nhs.Models.Validation;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Filters;
     using LearningHub.Nhs.WebUI.Helpers;
diff --git a/LearningHub.Nhs.WebUI/Controllers/UserController.cs b/LearningHub.Nhs.WebUI/Controllers/UserController.cs
index 284c2a0b9..4ad9edab3 100644
--- a/LearningHub.Nhs.WebUI/Controllers/UserController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/UserController.cs
@@ -252,7 +252,7 @@ public async Task<IActionResult> AdditionalSecurity(SecurityQuestionsViewModel s
             else
             {
                 var questions = await this.loginWizardService.GetSecurityQuestions();
-                securityQuestionsModel.SecurityQuestions = questions.Select(q => new SelectListItem() { Value = q.Id.ToString(), Text = q.Text }).ToList();
+                securityQuestionsModel.SecurityQuestions = questions.Select(q => (Value: q.Id.ToString(), Text: q.Text)).ToList();
             }
 
             return this.View("AdditionalSecurity", securityQuestionsModel);
diff --git a/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs b/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs
index 36cbcc9ff..c9305223e 100644
--- a/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs
+++ b/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs
@@ -3,6 +3,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Extensions;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Helpers;
     using LearningHub.Nhs.WebUI.Interfaces;
     using Microsoft.AspNetCore.Mvc;
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index cabf79b97..2e3cecfe4 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -11,6 +11,7 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<Platforms>x64</Platforms>
 		<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
+		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(RunConfiguration)' == 'Custom' ">
@@ -108,19 +109,20 @@
 
 	<ItemGroup>
 		<!--For Blazor-->
+		<PackageReference Include="FluentValidation" Version="11.11.0" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.8" />
 		<PackageReference Include="TELBlazor.Components" Version="1.10.0" />
 
 		<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<PackageReference Include="GDS.MultiPageFormData" Version="1.0.6" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
index 5ed5cc926..84d67a3c2 100644
--- a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
+++ b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
@@ -5,7 +5,7 @@
     using System.Net;
     using AspNetCoreRateLimit;
     using LearningHub.Nhs.Caching;
-    using LearningHub.Nhs.Models.Binders;
+    using LearningHub.Nhs.Caching.Binders;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Extensions;
     using LearningHub.Nhs.WebUI.Configuration;
diff --git a/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs b/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs
index cb2900fc2..cd5f29d15 100644
--- a/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs
+++ b/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs
@@ -10,6 +10,7 @@
     using IdentityModel.Client;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Extensions;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Shared.Interfaces.Http;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Extensions;
diff --git a/LearningHub.Nhs.WebUI/Services/CatalogueService.cs b/LearningHub.Nhs.WebUI/Services/CatalogueService.cs
index 934e942c1..dda1f95cc 100644
--- a/LearningHub.Nhs.WebUI/Services/CatalogueService.cs
+++ b/LearningHub.Nhs.WebUI/Services/CatalogueService.cs
@@ -10,6 +10,7 @@
     using LearningHub.Nhs.Models.Common;
     using LearningHub.Nhs.Models.User;
     using LearningHub.Nhs.Models.Validation;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Shared.Interfaces.Http;
     using LearningHub.Nhs.WebUI.Interfaces;
     using Microsoft.Extensions.Logging;
diff --git a/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs b/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs
index 9af95a1e6..9771d5d45 100644
--- a/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs
+++ b/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs
@@ -2,6 +2,7 @@
 {
     using System.Net.Http;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Shared.Interfaces.Http;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Interfaces;
diff --git a/LearningHub.Nhs.WebUI/Services/OpenApiHttpClient.cs b/LearningHub.Nhs.WebUI/Services/OpenApiHttpClient.cs
index 502025b0b..927508a70 100644
--- a/LearningHub.Nhs.WebUI/Services/OpenApiHttpClient.cs
+++ b/LearningHub.Nhs.WebUI/Services/OpenApiHttpClient.cs
@@ -2,6 +2,7 @@
 {
     using System.Net.Http;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Shared.Interfaces.Http;
     using LearningHub.Nhs.WebUI.Configuration;
     using Microsoft.AspNetCore.Http;
diff --git a/LearningHub.Nhs.WebUI/Services/ProviderService.cs b/LearningHub.Nhs.WebUI/Services/ProviderService.cs
index 7b0ed7d5d..069caa5fb 100644
--- a/LearningHub.Nhs.WebUI/Services/ProviderService.cs
+++ b/LearningHub.Nhs.WebUI/Services/ProviderService.cs
@@ -6,6 +6,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Provider;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Shared.Interfaces.Http;
     using LearningHub.Nhs.WebUI.Interfaces;
     using Microsoft.Extensions.Logging;
diff --git a/LearningHub.Nhs.WebUI/Services/RoleService.cs b/LearningHub.Nhs.WebUI/Services/RoleService.cs
index 5ce80f927..3535ad026 100644
--- a/LearningHub.Nhs.WebUI/Services/RoleService.cs
+++ b/LearningHub.Nhs.WebUI/Services/RoleService.cs
@@ -6,6 +6,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.User;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Shared.Interfaces.Http;
     using LearningHub.Nhs.WebUI.Interfaces;
     using Microsoft.Extensions.Logging;
diff --git a/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs b/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs
index 8483e44c6..7e75ca6cc 100644
--- a/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs
+++ b/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs
@@ -2,6 +2,7 @@
 {
     using System.Net.Http;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Shared.Interfaces.Http;
     using LearningHub.Nhs.WebUI.Configuration;
     using Microsoft.AspNetCore.Http;
diff --git a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs
index 3a33a3d60..5b6e892f5 100644
--- a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs
+++ b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs
@@ -8,6 +8,7 @@
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Extensions;
     using LearningHub.Nhs.Models.User;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Shared.Interfaces.Http;
     using LearningHub.Nhs.WebUI.Interfaces;
     using Microsoft.AspNetCore.Http;
diff --git a/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs b/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs
index e939bb2ea..c0cc3a616 100644
--- a/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs
+++ b/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs
@@ -6,6 +6,7 @@
     using System.Threading.Tasks;
     using IdentityModel;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Handlers;
     using LearningHub.Nhs.WebUI.Helpers;
diff --git a/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs b/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs
index 8284e1cfe..2c88d6bfe 100644
--- a/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs
+++ b/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs
@@ -2,6 +2,7 @@
 {
     using System.Threading.Tasks;
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Extensions;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Primitives;
diff --git a/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs b/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs
index 6b81891cd..b3f01e981 100644
--- a/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs
+++ b/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs
@@ -3,6 +3,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Extensions;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.WebUI.Interfaces;
     using LearningHub.Nhs.WebUI.Models;
     using Microsoft.AspNetCore.Mvc;
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_FooterPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_FooterPartial.cshtml
index 2c6e87651..844c53846 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_FooterPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_FooterPartial.cshtml
@@ -1,4 +1,4 @@
-@inject LearningHub.Nhs.Caching.ICacheService cacheService
+@inject LearningHub.Nhs.Models.WebUtilitiesInterfaces.ICacheService cacheService
 @using Microsoft.Extensions.Options;
 @using LearningHub.Nhs.WebUI.Configuration;
 @inject IOptions<Settings> settings;
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
index 594c62f7c..1beb7322b 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
@@ -1,4 +1,4 @@
-@inject LearningHub.Nhs.Caching.ICacheService cacheService
+@inject LearningHub.Nhs.Models.WebUtilitiesInterfaces.ICacheService cacheService
 @using LearningHub.Nhs.Models.Extensions
 @using Microsoft.Extensions.Options;
 @using LearningHub.Nhs.WebUI.Configuration;
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml
index 0825c43e8..b0b17db10 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_TimezoneInfoScriptPartial.cshtml
@@ -1,6 +1,6 @@
 @using LearningHub.Nhs.WebUI.Extensions
 @using LearningHub.Nhs.WebUI.Startup
-@inject LearningHub.Nhs.Caching.ICacheService cacheService
+@inject LearningHub.Nhs.Models.WebUtilitiesInterfaces.ICacheService cacheService
 
 @if (User.Identity.IsAuthenticated)
 {
diff --git a/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml b/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml
index 190d4c8fa..d2bb39acb 100644
--- a/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml
@@ -29,7 +29,13 @@
                                     <label asp-for="UserSecurityQuestions[i].SecurityQuestionId" class="control-label">Please select your @textualNumber[i] question</label>
                                 </dt>
                                 <dd class="nhsuk-summary-list__value">
-                                    <select asp-for="UserSecurityQuestions[i].SecurityQuestionId" class="form-control" asp-items="@Model.SecurityQuestions"></select>
+                                    <select asp-for="UserSecurityQuestions[i].SecurityQuestionId" class="form-control">
+                                        <!-- Manually populate the select list to keep Models agnostic -->
+                                        @foreach (var question in Model.SecurityQuestions)
+                                        {
+                                            <option value="@question.Value">@question.Text</option>
+                                        }
+                                    </select>
                                     <span asp-validation-for="UserSecurityQuestions[i].SecurityQuestionId" class="text-danger"></span>
                                 </dd>
                             </div>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index 727560e3f..cecf1b22a 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
 	</ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index 761899ec1..a328cf76b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
@@ -16,8 +16,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
+	
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index 6ede01bb6..d3bf9edd2 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -28,9 +28,8 @@
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
 		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
 		<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CachingService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CachingService.cs
index 958cb09e2..307f4debc 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CachingService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CachingService.cs
@@ -4,6 +4,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Enums;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.OpenApi.Models.Configuration;
     using LearningHub.Nhs.OpenApi.Services.Interface.Services;
     using Microsoft.Extensions.Logging;
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs
index fb9098bde..6c6610726 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs
@@ -1,6 +1,7 @@
 namespace LearningHub.Nhs.OpenApi.Services
 {
     using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.OpenApi.Services.HttpClients;
     using LearningHub.Nhs.OpenApi.Services.Interface.HttpClients;
     using LearningHub.Nhs.OpenApi.Services.Interface.Services;
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs
index 3dac1615d..18c03f524 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/UserController.cs
@@ -15,6 +15,7 @@
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Options;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
 
     /// <summary>
     /// The log controller.
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
index 227e30bf8..9925c85ea 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.3" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
index 3af90e39a..0948fa06c 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
@@ -18,7 +18,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AutoFixture" Version="4.18.1" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="Moq" Version="4.20.72" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
index c6d03d856..1e3c6f360 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
@@ -19,7 +19,7 @@
 		<PackageReference Include="AutoMapper" Version="10.1.1" />
 		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.3" />
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
index 78f41769e..8ce8cf572 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
index f87bb47d5..99ba74bda 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
@@ -20,7 +20,7 @@
 
 	<ItemGroup>
 
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
 
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index f4929f98d..95e9e3073 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -26,10 +26,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
 		<PackageReference Include="Microsoft.AspNetCore" Version="2.3.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
diff --git a/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs b/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs
index a9f0988ce..e0aff6d91 100644
--- a/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs
+++ b/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs
@@ -10,6 +10,7 @@ namespace LearningHub.Nhs.Api
     using LearningHub.Nhs.Migration.Validation;
     using LearningHub.Nhs.Migration.Validation.Helpers;
     using LearningHub.Nhs.Migration.Validation.Rules;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Repository;
     using LearningHub.Nhs.Repository.Activity;
     using LearningHub.Nhs.Repository.Analytics;
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index e3beb1a81..9d527cbb0 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -7,9 +7,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index a04a31296..3663de5ce 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -8,10 +8,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="FluentAssertions" Version="8.0.1" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="Moq" Version="4.20.72" />
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index df10ef031..9d55608d9 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -8,9 +8,9 @@
 
   <ItemGroup>
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-   <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-   <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+   <PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
+   <PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	 <PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index af6cc7469..2b4a6cf75 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -7,9 +7,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index 554e13326..eb697251a 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -14,9 +14,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.Storage.Queues" Version="12.21.0" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index 3cf41529f..4a808006d 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -9,11 +9,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="AutoFixture" Version="4.18.1" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="5.0.0" />
 		<PackageReference Include="FluentAssertions" Version="8.0.1" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
diff --git a/WebAPI/LearningHub.Nhs.Services/CachingService.cs b/WebAPI/LearningHub.Nhs.Services/CachingService.cs
index 615814d12..3202f887b 100644
--- a/WebAPI/LearningHub.Nhs.Services/CachingService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/CachingService.cs
@@ -5,6 +5,7 @@
     using LearningHub.Nhs.Api.Shared.Configuration;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Enums;
+    using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
     using LearningHub.Nhs.Services.Interface;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index a605dc73d..29e7ae3d2 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -10,10 +10,9 @@
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
 		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
 		<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="9.3.0" />
 		<PackageReference Include="Microsoft.Azure.Management.Media" Version="6.0.0" />
 		<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index 73f18f7cf..f914d3ed7 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -22,10 +22,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="IdentityModel" Version="5.2.0" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index 79bdcf576..5d0ad850c 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -7,9 +7,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index 418978976..e16c9b9f3 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -7,10 +7,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index 145020f8a..ec2a1743d 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -7,9 +7,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	</ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index 896acac85..ece0e8657 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -8,9 +8,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="Moq" Version="4.20.72" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index d9a8879c8..d786cc9e0 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -8,11 +8,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="AngleSharp" Version="0.16.1" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="FluentValidation" Version="11.11.0" />
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
-		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>