diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs
index 90fd149ce..f1422eaee 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs
@@ -1,5 +1,6 @@
 namespace LearningHub.Nhs.AdminUI.Controllers
 {
+    using LearningHub.Nhs.Models.Extensions;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
@@ -51,6 +52,11 @@ protected string WebRootPath
             }
         }
 
+        /// <summary>
+        /// Gets the CurrentUserEmail.
+        /// </summary>
+        protected string CurrentUserEmail => this.User.Identity.GetCurrentEmail();
+
         /// <summary>
         /// The OnActionExecuting.
         /// </summary>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs
index 508684668..49aef9634 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs
@@ -1,11 +1,19 @@
-namespace LearningHub.Nhs.AdminUI.Controllers
+using LearningHub.Nhs.Models.Databricks;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using System.Net;
+
+namespace LearningHub.Nhs.AdminUI.Controllers
 {
+    using AngleSharp.Io;
+    using Azure;
     using LearningHub.Nhs.AdminUI.Configuration;
     using LearningHub.Nhs.AdminUI.Extensions;
+    using LearningHub.Nhs.AdminUI.Helpers;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.AdminUI.Models;
     using LearningHub.Nhs.Models.Catalogue;
     using LearningHub.Nhs.Models.Common;
+    using LearningHub.Nhs.Models.Databricks;
     using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.Paging;
     using LearningHub.Nhs.Models.Resource;
@@ -70,6 +78,11 @@ public class CatalogueController : BaseController
         /// </summary>
         private readonly IMoodleApiService moodleApiService;
 
+        /// <summary>
+        /// Defines the moodleApiService.
+        /// </summary>
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
+
         /// <summary>
         /// Defines the _settings.
         /// </summary>
@@ -104,6 +117,7 @@ public class CatalogueController : BaseController
         /// <param name="fileService">The fileService<see cref="IFileService"/>.</param>
         /// <param name="providerService">The providerService<see cref="IProviderService"/>.</param>
         /// <param name="moodleApiService">The moodleApiService<see cref="IMoodleApiService"/>.</param>
+        /// <param name="moodleBridgeApiService">The moodleApiService<see cref="moodleBridgeApiService"/>.</param>
         /// <param name="logger">The logger<see cref="ILogger{LogController}"/>.</param>
         /// <param name="options">The options<see cref="IOptions{WebSettings}"/>.</param>
         /// <param name="websettings">The websettings<see cref="IOptions{WebSettings}"/>.</param>
@@ -114,6 +128,7 @@ public CatalogueController(
             IFileService fileService,
             IProviderService providerService,
             IMoodleApiService moodleApiService,
+            IMoodleBridgeApiService moodleBridgeApiService,
             ILogger<LogController> logger,
             IOptions<WebSettings> options,
             IOptions<WebSettings> websettings)
@@ -124,6 +139,7 @@ public CatalogueController(
             this.fileService = fileService;
             this.providerService = providerService;
             this.moodleApiService = moodleApiService;
+            this.moodleBridgeApiService = moodleBridgeApiService;
             this.logger = logger;
             this.websettings = websettings;
             this.settings = options.Value;
@@ -277,17 +293,9 @@ public async Task<IActionResult> MoodleCategory(int id)
                 return this.RedirectToAction("Error");
             }
 
-            var categories = await this.moodleApiService.GetAllMoodleCategoriesAsync();
-
-            vm.MoodleCategories = categories;
+            var categoriesResult = await this.moodleBridgeApiService.GetAllMoodleCategoriesAsync();
 
-            // Build hierarchical select list
-            var selectList = BuildList(categories, parentId: null, depth: 0);
-            foreach (var item in selectList)
-            {
-                item.Text = WebUtility.HtmlDecode(item.Text);
-            }
-            vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
+            vm.MoodleCategorySelectList = BuildMoodleCategorySelectList(categoriesResult);
             this.ViewData["CatalogueName"] = vm.Name;
             this.ViewData["id"] = id;
 
@@ -727,32 +735,33 @@ public async Task<IActionResult> AddUserGroupsToCatalogue(int catalogueNodeId, i
         [Route("AddCategoryToCatalogue")]
         public async Task<IActionResult> AddCategoryToCatalogue(CatalogueViewModel catalogueViewModel)
         {
-            if (catalogueViewModel.SelectedCategoryId == 0)
+            if (string.IsNullOrEmpty(catalogueViewModel.SelectedCategoryId))
             {
                 this.ModelState.AddModelError("SelectedCategoryId", "Please select a category.");
-            }
-            var vm = await this.catalogueService.GetCatalogueAsync(catalogueViewModel.CatalogueNodeVersionId);
-            vm.SelectedCategoryId = catalogueViewModel.SelectedCategoryId;
-            var vr = await this.catalogueService.AddCategoryToCatalogue(vm);
-            if (vr.Success)
-            {
-                var categories = await this.moodleApiService.GetAllMoodleCategoriesAsync();
-                vm.MoodleCategories = categories;
-                // Build hierarchical select list
-                var selectList = BuildList(categories, parentId: null, depth: 0);
-      
-                foreach (var item in selectList)
-                {
-                    item.Text = WebUtility.HtmlDecode(item.Text);
-                }
+                var vm = await this.catalogueService.GetCatalogueAsync(catalogueViewModel.CatalogueNodeVersionId);
+                var categories = await this.moodleBridgeApiService.GetAllMoodleCategoriesAsync();
+                vm.SelectedCategoryId = null;
+                vm.MoodleCategorySelectList = BuildMoodleCategorySelectList(categories);
 
-                vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
                 return this.View("MoodleCategory", vm);
             }
+
             else
             {
-                this.ViewBag.ErrorMessage = $"Category Update failed.";
-                return this.View("MoodleCategory", vm);
+                var vm = await this.catalogueService.GetCatalogueAsync(catalogueViewModel.CatalogueNodeVersionId);
+                vm.SelectedCategoryId = catalogueViewModel.SelectedCategoryId;
+                var vr = await this.catalogueService.AddCategoryToCatalogue(vm);
+                if (vr.Success)
+                {
+                    var categories = await this.moodleBridgeApiService.GetAllMoodleCategoriesAsync();
+                    vm.MoodleCategorySelectList = BuildMoodleCategorySelectList(categories);
+                    return this.View("MoodleCategory", vm);
+                }
+                else
+                {
+                    this.ViewBag.ErrorMessage = $"Category Update failed.";
+                    return this.View("MoodleCategory", vm);
+                }
             }
         }
 
@@ -764,23 +773,16 @@ public async Task<IActionResult> AddCategoryToCatalogue(CatalogueViewModel catal
         /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
         [HttpGet]
         [Route("RemoveCategoryFromCatalogue/{categoryId}/{catalogueNodeVersionId}")]
-        public async Task<IActionResult> RemoveCategoryFromCatalogue(int categoryId, int catalogueNodeVersionId)
+        public async Task<IActionResult> RemoveCategoryFromCatalogue(string categoryId, int catalogueNodeVersionId)
         {
             var vm = await this.catalogueService.GetCatalogueAsync(catalogueNodeVersionId);
             vm.SelectedCategoryId = categoryId;
             var vr = await this.catalogueService.RemoveCategoryFromCatalogue(vm);
             if (vr.Success)
             {
-                var categories = await this.moodleApiService.GetAllMoodleCategoriesAsync();
-                vm.MoodleCategories = categories;
-                vm.SelectedCategoryId = 0;
-                // Build hierarchical select list
-                var selectList = BuildList(categories, parentId: null, depth: 0);
-                foreach (var item in selectList)
-                {
-                    item.Text = WebUtility.HtmlDecode(item.Text);
-                }
-                vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
+                var categories = await this.moodleBridgeApiService.GetAllMoodleCategoriesAsync();
+                vm.MoodleCategorySelectList = BuildMoodleCategorySelectList(categories);
+                vm.SelectedCategoryId = null;
                 return this.View("MoodleCategory", vm);
             }
             else
@@ -1090,33 +1092,91 @@ private void ValidateCatalogueOwnerVm(CatalogueOwnerViewModel vm)
             }
         }
 
-        private List<SelectListItem> BuildList(IEnumerable<MoodleCategory> allCategories, int? parentId, int depth)
+        public static SelectList BuildMoodleCategorySelectList(IEnumerable<CategoryResult> results)
         {
             var selectList = new List<SelectListItem>();
 
-            // Handle both null and 0 as top-level depending on Moodle data
-            var children = allCategories
-                .Where(c => c.Parent == parentId || (parentId == null && (c.Parent == 0 || c.Parent == 0)))
-                .OrderBy(c => c.Name)
-                .ToList();
-
-            foreach (var child in children)
+            foreach (var result in results)
             {
-                // Indent with non-breaking spaces so browser keeps them
-                string indent = new string('\u00A0', depth * 3);
+                if (string.IsNullOrWhiteSpace(result.Instance))
+                    continue;
 
+                // Instance header
                 selectList.Add(new SelectListItem
                 {
-                    Value = child.Id.ToString(),
-                    Text = $"{indent}{child.Name}"
+                    Value = "",
+                    Text = result.Instance,
+                    Disabled = true,
+                    Selected = false
                 });
 
-                // Recursively add nested children
-                selectList.AddRange(BuildList(allCategories, child.Id, depth + 1));
+                // Handle instance error
+                if (result.Error != null)
+                {
+                    selectList.Add(new SelectListItem
+                    {
+                        Value = "",
+                        Text = "\u00A0\u00A0[Category unavailable]",
+                        Disabled = true,
+                        Selected = false
+                    });
+
+                    continue;
+                }
+
+                var categories = result.Data?.Categories;
+                if (categories == null || !categories.Any())
+                    continue;
+
+                var tree = categories
+                    .GroupBy(c => c.Parent)
+                    .ToDictionary(g => g.Key, g => g.OrderBy(x => x.Name).ToList());
+
+                TreeBuilderHelper.BuildTree(selectList, tree, 0, 1, result.Instance);
+            }
+
+            // Decode HTML entities
+            foreach (var item in selectList)
+            {
+                item.Text = WebUtility.HtmlDecode(item.Text);
             }
 
-            return selectList;
+            return new SelectList(selectList, "Value", "Text");
         }
 
+        /// </summary>
+        /// <param name="selectList"></param>
+        /// <param name="tree"></param>
+        /// <param name="parentId"></param>
+        /// <param name="depth"></param>
+        /// <param name="instance"></param>
+        /// <param name="group"></param>
+
+        // Recursive tree builder with indentation
+        private static void BuildTree(
+            List<SelectListItem> selectList,
+            Dictionary<int, List<MoodleCategory>> tree,
+            int parentId,
+            int depth,
+            string instance,
+            SelectListGroup group)
+        {
+            if (!tree.ContainsKey(parentId))
+                return;
+
+            foreach (var category in tree[parentId])
+            {
+                string indent = new string('\u00A0', depth * 2);
+
+                selectList.Add(new SelectListItem
+                {
+                    Value = $"{instance}:{category.Id}",
+                    Text = $"{indent}{category.Name}",
+                    Group = group
+                });
+
+                BuildTree(selectList, tree, category.Id, depth + 1, instance, group);
+            }
+        }
     }
 }
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/TreeBuilderHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/TreeBuilderHelper.cs
new file mode 100644
index 000000000..dae4fc31f
--- /dev/null
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/TreeBuilderHelper.cs
@@ -0,0 +1,44 @@
+namespace LearningHub.Nhs.AdminUI.Helpers
+{
+    using LearningHub.Nhs.Models.Moodle;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Defines the <see cref="TreeBuilderHelper" />.
+    /// </summary>
+    public static class TreeBuilderHelper
+    {
+        /// <summary>
+        /// BuildSelectListFromCategories.
+        /// </summary>
+        /// <param name="selectList">The selectList.</param>
+        /// <param name="tree">The tree.</param>
+        /// <param name="parentId">The parentId.</param>
+        /// <param name="depth">The depth.</param>
+        /// <param name="instance">The instance.</param>
+        public static void BuildTree(
+     List<SelectListItem> selectList,
+     Dictionary<int, List<MoodleCategory>> tree,
+     int parentId,
+     int depth,
+     string instance)
+        {
+            if (!tree.ContainsKey(parentId))
+                return;
+
+            foreach (var category in tree[parentId])
+            {
+                string indent = new string('\u00A0', depth * 2);
+
+                selectList.Add(new SelectListItem
+                {
+                    Value = $"{instance}:{category.Id}",
+                    Text = $"{indent}{category.Name}"
+                });
+
+                BuildTree(selectList, tree, category.Id, depth + 1, instance);
+            }
+        }
+    }
+}
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IMoodleBridgeApiService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IMoodleBridgeApiService.cs
new file mode 100644
index 000000000..f5e25b1cf
--- /dev/null
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IMoodleBridgeApiService.cs
@@ -0,0 +1,19 @@
+namespace LearningHub.Nhs.AdminUI.Interfaces
+{
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Moodle;
+    using LearningHub.Nhs.Models.Moodle.API;
+
+    /// <summary>
+    /// IMoodleBridgeApiService.
+    /// </summary>
+    public interface IMoodleBridgeApiService
+    {
+        /// <summary>
+        /// GetAllMoodleCategoriesAsync.
+        /// </summary>
+        /// <returns> List of MoodleCategory.</returns>
+        Task<List<CategoryResult>> GetAllMoodleCategoriesAsync();
+    }
+}
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index a42f95f98..1e0cbbb2d 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -89,7 +89,7 @@
 		<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="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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/LearningHub.Nhs.AdminUI.csproj.user b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
index 75a932fca..a753af4d7 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
@@ -4,7 +4,7 @@
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup>
-    <ActiveDebugProfile>Local IIS</ActiveDebugProfile>
+    <ActiveDebugProfile>IIS Local</ActiveDebugProfile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
     <View_SelectedScaffolderID>RazorViewEmptyScaffolder</View_SelectedScaffolderID>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
index 9137a55e7..8db722e30 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
@@ -107,6 +107,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
             services.AddTransient<IInternalSystemService, InternalSystemService>();
             services.AddScoped<IProviderService, ProviderService>();
             services.AddScoped<IMoodleApiService, MoodleApiService>();
+            services.AddScoped<IMoodleBridgeApiService, MoodleBridgeApiService>();
 
             // Configure Azure Search
             services.Configure<AzureSearchConfig>(configuration.GetSection("AzureSearch"));
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/MoodleBridgeApiService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/MoodleBridgeApiService.cs
new file mode 100644
index 000000000..92d0677cb
--- /dev/null
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/MoodleBridgeApiService.cs
@@ -0,0 +1,62 @@
+namespace LearningHub.Nhs.AdminUI.Services
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.AdminUI.Configuration;
+    using LearningHub.Nhs.AdminUI.Interfaces;
+    using LearningHub.Nhs.Models.Moodle;
+    using LearningHub.Nhs.Models.Moodle.API;
+    using Microsoft.Extensions.Options;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// MoodleBridgeApiService.
+    /// </summary>
+    public class MoodleBridgeApiService : IMoodleBridgeApiService
+    {
+        private readonly IOpenApiHttpClient openApiHttpClient;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MoodleApiService"/> class.
+        /// </summary>
+        /// <param name="openApiHttpClient">The Open Api Http Client.</param>
+        public MoodleBridgeApiService(IOpenApiHttpClient openApiHttpClient)
+        {
+            this.openApiHttpClient = openApiHttpClient;
+        }
+
+        /// <summary>
+        /// GetAllMoodleCategoriesAsync.
+        /// </summary>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<List<CategoryResult>> GetAllMoodleCategoriesAsync()
+        {
+            List<CategoryResult> viewmodel = new List<CategoryResult>();
+
+            try
+            {
+                var client = await this.openApiHttpClient.GetClientAsync();
+
+                var request = $"MoodleBridge/GetAllMoodleCategories";
+                var response = await client.GetAsync(request).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = response.Content.ReadAsStringAsync().Result;
+                    viewmodel = JsonConvert.DeserializeObject<List<CategoryResult>>(result);
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                 return viewmodel;
+            }
+            catch (Exception ex)
+            { 
+                return viewmodel;
+            }
+        }
+    }
+}
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/MoodleCategory.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/MoodleCategory.cshtml
index 81ea1901d..a2116742b 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/MoodleCategory.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/MoodleCategory.cshtml
@@ -6,7 +6,8 @@
     var page = CatalogueNavPage.Category;
     ViewData["Title"] = "Manage Category";
     var selectedCategoryName = Model.MoodleCategorySelectList
-        .FirstOrDefault(c => c.Value == Model.SelectedCategoryId.ToString())?.Text;
+    .FirstOrDefault(c => c.Value == Model.SelectedCategoryId?.ToString())?.Text
+    ?? string.Empty;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
 }
 @section SideMenu {
@@ -40,7 +41,7 @@
         <div class="mt-5">
             <div class="row">
                 <div class="form-group">
-                    @if (Model.SelectedCategoryId > 0)
+                    @if (Model.SelectedCategoryId != null)
                     {
                         <div class="nhs-item-row">
                             <div id="selectedCategoryDisplay" class="nhsuk-u-padding-left-3">
@@ -53,7 +54,7 @@
                         </div>
                     }
 
-                    <div id="divcategory" class="nhsuk-u-padding-left-3" style="@(Model.SelectedCategoryId == 0 ? "display:block;" : "display:none;")">
+                    <div id="divcategory" class="nhsuk-u-padding-left-3" style="@(Model.SelectedCategoryId == null ? "display:block;" : "display:none;")">
                         <div id="diverror" class="nhsuk-form-group @(errorHasOccurred ? "nhsuk-form-group--error" : "")">
                             @if (errorHasOccurred)
                             {
@@ -68,8 +69,18 @@
                             </div>
                             <div class="nhsuk-u-padding-bottom-5">
                                 <div>
-                                    <select asp-for="SelectedCategoryId" asp-items="@Model.MoodleCategorySelectList" class="nhsuk-input nhsuk-u-font-size-24">
+                                    @* <select asp-for="SelectedCategoryId" asp-items="@Model.MoodleCategorySelectList" class="nhsuk-input nhsuk-u-font-size-24">
                                         <option value="0">-- Select --</option>
+                                    </select> *@
+
+                                    <select asp-for="SelectedCategoryId" class="nhsuk-input nhsuk-u-font-size-24">
+                                        <option value="">-- Select --</option>
+                                        @foreach (var item in Model.MoodleCategorySelectList)
+                                        {
+                                            <option value="@item.Value" disabled="@(string.IsNullOrEmpty(item.Value) ? "disabled" : null)">
+                                                @item.Text
+                                            </option>
+                                        }
                                     </select>
                                 </div>
                             </div>
diff --git a/LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj b/LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj
index 4c85e0949..34a9455d2 100644
--- a/LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj
+++ b/LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj
@@ -13,7 +13,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 		<PackageReference Include="Selenium.Axe" Version="4.0.19" />
diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index 1309ff694..2d7c2901b 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -67,6 +67,7 @@ public class AccountController : BaseController
         /// <param name="specialtyService">The specialtyService.</param>
         /// <param name="locationService">The locationService.</param>
         /// <param name="gradeService">The gradeService.</param>
+        /// <param name="moodleBridgeApiService">The moodleBridgeApiService.</param>
         public AccountController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
@@ -82,8 +83,9 @@ public AccountController(
             IMultiPageFormService multiPageFormService,
             ISpecialtyService specialtyService,
             ILocationService locationService,
-            IGradeService gradeService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            IGradeService gradeService,
+            IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.authConfig = authConfig;
             this.userService = userService;
diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs
index 64b6de28d..3d92a22ca 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs
@@ -1,6 +1,7 @@
 namespace LearningHub.Nhs.WebUI.Controllers.Api
 {
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.MyLearning;
     using LearningHub.Nhs.WebUI.Helpers;
     using LearningHub.Nhs.WebUI.Interfaces;
@@ -44,34 +45,6 @@ public async Task<ActionResult> GetActivityDetailed([FromBody] MyLearningRequest
             return this.Ok(activity);
         }
 
-        /// <summary>
-        /// Gets the detailed activity data.
-        /// </summary>
-        /// <param name="requestModel">The request model - filter settings.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        [HttpPost]
-        [Route("GetUserRecentMyLearningActivities")]
-        public async Task<ActionResult> GetUserRecentMyLearningActivities([FromBody] MyLearningRequestModel requestModel)
-        {
-            var activity = await this.myLearningService.GetUserRecentMyLearningActivities(requestModel);
-
-            return this.Ok(activity);
-        }
-
-        /// <summary>
-        /// Gets the detailed activity data.
-        /// </summary>
-        /// <param name="requestModel">The request model - filter settings.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        [HttpPost]
-        [Route("GetUserLearningHistory")]
-        public async Task<ActionResult> GetUserLearningHistory([FromBody] MyLearningRequestModel requestModel)
-        {
-            var activity = await this.myLearningService.GetUserLearningHistory(requestModel);
-
-            return this.Ok(activity);
-        }
-
         /// <summary>
         /// Gets the played segment data for the progress modal in My Learning screen.
         /// </summary>
diff --git a/LearningHub.Nhs.WebUI/Controllers/BaseController.cs b/LearningHub.Nhs.WebUI/Controllers/BaseController.cs
index 6b3ad9a20..77fd780ad 100644
--- a/LearningHub.Nhs.WebUI/Controllers/BaseController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/BaseController.cs
@@ -1,11 +1,16 @@
 namespace LearningHub.Nhs.WebUI.Controllers
 {
+    using System.Collections.Generic;
     using System.Net.Http;
+    using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Extensions;
+    using LearningHub.Nhs.Models.Moodle;
+    using LearningHub.Nhs.Models.Moodle.API;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Extensions;
     using LearningHub.Nhs.WebUI.Filters;
     using LearningHub.Nhs.WebUI.Helpers;
+    using LearningHub.Nhs.WebUI.Interfaces;
     using LearningHub.Nhs.WebUI.Models;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
@@ -20,25 +25,34 @@ public abstract class BaseController : Controller
         private readonly IWebHostEnvironment hostingEnvironment;
         private readonly IHttpClientFactory httpClientFactory;
         private readonly ILogger logger;
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
         private readonly Settings settings;
         private TenantViewModel currentTenant;
 
+        /// <summary>
+        /// The list of Moodle UserIds.
+        /// </summary>
+        private MoodleInstanceUserIdsViewModel moodleUserIds;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseController"/> class.
         /// </summary>
         /// <param name="hostingEnv">Hosting env.</param>
         /// <param name="httpClientFactory">Http client factory.</param>
         /// <param name="logger">Logger.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         /// <param name="settings">Settings.</param>
         protected BaseController(
             IWebHostEnvironment hostingEnv,
             IHttpClientFactory httpClientFactory,
             ILogger logger,
+            IMoodleBridgeApiService moodleBridgeApiService,
             Settings settings)
         {
             this.hostingEnvironment = hostingEnv;
             this.httpClientFactory = httpClientFactory;
             this.logger = logger;
+            this.moodleBridgeApiService = moodleBridgeApiService;
             this.settings = settings;
         }
 
@@ -82,6 +96,16 @@ protected BaseController(
         /// </summary>
         protected int CurrentMoodleUserId => this.User.Identity.GetMoodleUserId();
 
+        /// <summary>
+        /// Gets the CurrentUserEmail.
+        /// </summary>
+        protected string CurrentUserEmail => this.User.Identity.GetCurrentEmail();
+
+        /// <summary>
+        /// Gets the MoodleInstanceUserIds.
+        /// </summary>
+        protected MoodleInstanceUserIdsViewModel MoodleInstanceUserIds => this.GetUserIdsPerInstances().Result;
+
         /// <summary>
         /// The OnActionExecuting.
         /// </summary>
@@ -92,6 +116,23 @@ public override void OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionEx
             base.OnActionExecuting(context);
         }
 
+        /// <summary>
+        /// The get user ids and instances async.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        public async Task<MoodleInstanceUserIdsViewModel> GetUserIdsPerInstances()
+        {
+            if (this.moodleUserIds == null)
+            {
+                var moodleUserInstances = await this.moodleBridgeApiService.GetUserInstancesByEmail(this.CurrentUserEmail);
+                this.moodleUserIds = moodleUserInstances;
+            }
+
+            return this.moodleUserIds;
+        }
+
         /// <summary>
         /// The Initialise.
         /// </summary>
diff --git a/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs b/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs
index 0d699fe4d..f41f2cb9b 100644
--- a/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs
@@ -33,13 +33,15 @@ public partial class BookmarkController : BaseController
         /// <param name="settings">The settings.</param>
         /// <param name="httpClientFactory">The httpClientFactory.</param>
         /// <param name="bookmarkService">bookmarkService.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public BookmarkController(
             IWebHostEnvironment hostingEnvironment,
             ILogger<ResourceController> logger,
             IOptions<Settings> settings,
             IHttpClientFactory httpClientFactory,
-            IBookmarkService bookmarkService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            IBookmarkService bookmarkService,
+            IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.bookmarkService = bookmarkService;
         }
diff --git a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
index b6c3e82f6..c8156e23e 100644
--- a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
@@ -9,6 +9,8 @@
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Catalogue;
     using LearningHub.Nhs.Models.Dashboard;
+    using LearningHub.Nhs.Models.Databricks;
+    using LearningHub.Nhs.Models.Entities.Hierarchy;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Hierarchy;
     using LearningHub.Nhs.Models.Moodle;
@@ -19,6 +21,7 @@
     using LearningHub.Nhs.WebUI.Interfaces;
     using LearningHub.Nhs.WebUI.Models.Catalogue;
     using LearningHub.Nhs.WebUI.Models.Search;
+    using LinqToTwitter;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
@@ -42,7 +45,7 @@ public class CatalogueController : BaseController
         private IUserService userService;
         private IUserGroupService userGroupService;
         private IHierarchyService hierarchyService;
-        private Settings settings;
+        private Configuration.Settings settings;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CatalogueController"/> class.
@@ -60,21 +63,23 @@ public class CatalogueController : BaseController
         /// <param name="hierarchyService">HierarchyService.</param>
         /// <param name="userGroupService">userGroupService.</param>
         /// <param name="categoryService">categoryService.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public CatalogueController(
            IHttpClientFactory httpClientFactory,
            IWebHostEnvironment hostingEnvironment,
            ILogger<CatalogueController> logger,
            ICatalogueService catalogueService,
            IUserService userService,
-           IOptions<Settings> settings,
+           IOptions<Configuration.Settings> settings,
            LearningHubAuthServiceConfig authConfig,
            ISearchService searchService,
            ICacheService cacheService,
            IDashboardService dashboardService,
            IHierarchyService hierarchyService,
            IUserGroupService userGroupService,
-           ICategoryService categoryService)
-           : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+           ICategoryService categoryService,
+           IMoodleBridgeApiService moodleBridgeApiService)
+           : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.authConfig = authConfig;
             this.catalogueService = catalogueService;
@@ -192,13 +197,13 @@ public IActionResult CatalogueWithAuthentication(string reference)
         /// <param name="tab">The tab name to display.</param>
         /// <param name="nodeId">The nodeId of the current folder. If not supplied, catalogue root contents are displayed.</param>
         /// <param name="search">The SearchRequestViewModel.</param>
-        /// <param name="moodleCategoryId">The moodleCategoryId.</param>
+        /// <param name="categoryId">The moodleCategoryId.</param>
         /// <returns>IActionResult.</returns>
         [AllowAnonymous]
         [ServiceFilter(typeof(SsoLoginFilterAttribute))]
         [HttpGet]
         [Route("catalogue/{reference}/{tab?}")]
-        public async Task<IActionResult> IndexAsync(string reference, string tab, int? nodeId, SearchRequestViewModel search, int? moodleCategoryId)
+        public async Task<IActionResult> IndexAsync(string reference, string tab, int? nodeId, SearchRequestViewModel search, string? categoryId)
         {
             if (tab == null || (tab == "search" && !this.User.Identity.IsAuthenticated))
             {
@@ -212,8 +217,9 @@ public async Task<IActionResult> IndexAsync(string reference, string tab, int? n
             this.ViewBag.ActiveTab = tab;
 
             var catalogue = await this.catalogueService.GetCatalogueAsync(reference);
-            var catalogueCategoryId = await this.categoryService.GetCatalogueVersionCategoryAsync(catalogue.Id);
-            catalogue.SelectedCategoryId = catalogueCategoryId;
+            var catalogueCategory = await this.categoryService.GetCatalogueVersionCategoryAsync(catalogue.Id);
+            catalogue.SelectedCategoryId = catalogueCategory != null ? $"{catalogueCategory.InstanceName}:{catalogueCategory.CategoryId}" : null;
+
             if (catalogue == null)
             {
                 return this.RedirectToAction("Error", "Home");
@@ -270,22 +276,40 @@ public async Task<IActionResult> IndexAsync(string reference, string tab, int? n
             bool includeEmptyFolder = viewModel.UserGroups.Any(x => x.RoleId == (int)RoleEnum.LocalAdmin || x.RoleId == (int)RoleEnum.Editor || x.RoleId == (int)RoleEnum.Previewer) || this.User.IsInRole("Administrator");
             var nodeContents = await this.hierarchyService.GetNodeContentsForCatalogueBrowse(nodeId.Value, includeEmptyFolder);
             viewModel.NodeContents = nodeContents;
-
-            int categoryId = moodleCategoryId ?? await this.categoryService.GetCatalogueVersionCategoryAsync(catalogue.Id);
-            if (categoryId > 0)
+            var catalogueNodeVersionCategory = await this.categoryService.GetCatalogueVersionCategoryAsync(catalogue.Id);
+            string moodleInstanceCategoryId = null;
+            if (categoryId != null)
             {
-                var response = await this.categoryService.GetCoursesByCategoryIdAsync(categoryId);
-                viewModel.Courses = response.Courses;
-
-                var subCategories = await this.categoryService.GetSubCategoryByCategoryIdAsync(categoryId);
-                viewModel.SubCategories = subCategories;
+                moodleInstanceCategoryId = $"{catalogueNodeVersionCategory.InstanceName}:{categoryId}";
+            }
+            else
+            {
+                moodleInstanceCategoryId = catalogueNodeVersionCategory != null ? $"{catalogueNodeVersionCategory.InstanceName}:{catalogueNodeVersionCategory.CategoryId}" : null;
+            }
 
-                if (moodleCategoryId.HasValue)
+            if (!string.IsNullOrEmpty(moodleInstanceCategoryId))
+            {
+                var response = await this.categoryService.GetCoursesByCategoryIdAsync(moodleInstanceCategoryId);
+                viewModel.Courses = response?.Results?
+    .Where(r => r.Instance == catalogueNodeVersionCategory.InstanceName)
+    .SelectMany(r => r.Data?.Courses.Courses ?? new List<Course>())
+    .ToList();
+
+                var subCategories = await this.categoryService.GetSubCategoryByCategoryIdAsync(moodleInstanceCategoryId);
+                viewModel.SubCategories = subCategories
+    .Where(x => x.Instance == catalogueNodeVersionCategory.InstanceName &&
+                x.Data?.Categories != null &&
+                x.Data.Categories.Count > 0)
+    .SelectMany(x => x.Data.Categories)
+    .ToList();
+                if (moodleInstanceCategoryId != null)
                 {
                     var moodleCategories = await this.categoryService.GetAllMoodleCategoriesAsync();
 
+                    var (moodleInstanceName, moodleCategoryId) = moodleInstanceCategoryId.Split(':') is var p && p.Length == 2 ? (p[0], p[1]) : (null, null);
+
                     // Start with the selected category
-                    var breadcrumbCategory = moodleCategories.FirstOrDefault(x => x.Id == moodleCategoryId);
+                    var breadcrumbCategory = moodleCategories.FirstOrDefault(x => x.Id == Convert.ToInt32(moodleCategoryId));
 
                     List<MoodleCategory> categories = new List<MoodleCategory>();
                     categories.Insert(0, new MoodleCategory
@@ -299,12 +323,6 @@ public async Task<IActionResult> IndexAsync(string reference, string tab, int? n
                         // Add the current category to the breadcrumb list
                         categories.Insert(1, breadcrumbCategory);
 
-                        // If there's no parent, stop
-                        if (breadcrumbCategory.Parent == 0 || breadcrumbCategory.Parent == catalogueCategoryId)
-                        {
-                            break;
-                        }
-
                         // Move up one level
                         breadcrumbCategory = moodleCategories.FirstOrDefault(x => x.Id == breadcrumbCategory.Parent);
                     }
@@ -324,7 +342,7 @@ public async Task<IActionResult> IndexAsync(string reference, string tab, int? n
             }
             else
             {
-                viewModel.Catalogue.SelectedCategoryId = 0;
+                viewModel.Catalogue.SelectedCategoryId = null;
             }
 
             if (tab == "search")
@@ -373,9 +391,14 @@ public async Task<IActionResult> IndexAsync(string reference, string tab, int? n
         [Route("GetCourses/{catalogueNodeVerstionId}/{reference}/{tab}")]
         public async Task<IActionResult> GetCourses(int catalogueNodeVerstionId, string reference, string tab)
         {
-            var categoryId = await this.categoryService.GetCatalogueVersionCategoryAsync(catalogueNodeVerstionId);
+            var catalogueCategory = await this.categoryService.GetCatalogueVersionCategoryAsync(catalogueNodeVerstionId);
+            string categoryId = catalogueCategory.InstanceName + ":" + catalogueCategory.CategoryId;
             var response = await this.categoryService.GetCoursesByCategoryIdAsync(categoryId);
-            return this.PartialView("Courses", response.Courses);
+            var courses = response?.Results?
+    .Where(r => r.Instance == catalogueCategory.InstanceName)
+    .SelectMany(r => r.Data?.Courses.Courses ?? new List<Course>())
+    .ToList();
+            return this.PartialView("Courses", courses);
         }
 
         /// <summary>
diff --git a/LearningHub.Nhs.WebUI/Controllers/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/ContributeController.cs
index 27ae615ce..e78a2c6b5 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ContributeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ContributeController.cs
@@ -44,6 +44,7 @@ public class ContributeController : BaseController
         /// <param name="azureMediaService">Azure media service.</param>
         /// <param name="authConfig">Auth config.</param>
         /// <param name="contributeService">Contribure service.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public ContributeController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
@@ -55,8 +56,9 @@ public ContributeController(
             IResourceService resourceService,
             IAzureMediaService azureMediaService,
             LearningHubAuthServiceConfig authConfig,
-            IContributeService contributeService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            IContributeService contributeService,
+            IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.authConfig = authConfig;
 
diff --git a/LearningHub.Nhs.WebUI/Controllers/ContributeResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ContributeResourceController.cs
index cd9ec928c..ea546cc5e 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ContributeResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ContributeResourceController.cs
@@ -39,14 +39,16 @@ public class ContributeResourceController : BaseController
         /// <param name="httpClientFactory">Http client factory.</param>
         /// <param name="logger">Logger.</param>
         /// <param name="settings">Settings.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public ContributeResourceController(
             IResourceService resourceService,
             ICatalogueService catalogueService,
             IWebHostEnvironment hostingEnv,
+            IMoodleBridgeApiService moodleBridgeApiService,
             IHttpClientFactory httpClientFactory,
             ILogger<ContributeResourceController> logger,
             IOptions<Settings> settings)
-            : base(hostingEnv, httpClientFactory, logger, settings.Value)
+            : base(hostingEnv, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.resourceService = resourceService;
             this.catalogueService = catalogueService;
diff --git a/LearningHub.Nhs.WebUI/Controllers/FileController.cs b/LearningHub.Nhs.WebUI/Controllers/FileController.cs
index e314d1525..5106aa645 100644
--- a/LearningHub.Nhs.WebUI/Controllers/FileController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/FileController.cs
@@ -25,13 +25,15 @@ public class FileController : BaseController
         /// <param name="settings">The settings.</param>
         /// <param name="httpClientFactory">The httpClientFactory.</param>
         /// <param name="fileService">The fileService.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public FileController(
             IWebHostEnvironment hostingEnvironment,
             ILogger<ResourceController> logger,
             IOptions<Settings> settings,
             IHttpClientFactory httpClientFactory,
-            IFileService fileService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            IFileService fileService,
+            IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.fileService = fileService;
         }
diff --git a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs
index 5f4540b57..b9f2967c1 100644
--- a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs
@@ -50,6 +50,7 @@ public class HomeController : BaseController
         /// <param name="httpClientFactory">Http client factory.</param>
         /// <param name="hostingEnvironment">Hosting environment.</param>
         /// <param name="logger">Logger.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         /// <param name="settings">Settings.</param>
         /// <param name="userService">User service.</param>
         /// <param name="resourceService">Resource service.</param>
@@ -62,6 +63,7 @@ public class HomeController : BaseController
         public HomeController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
+            IMoodleBridgeApiService moodleBridgeApiService,
             ILogger<HomeController> logger,
             IOptions<Settings> settings,
             IUserService userService,
@@ -72,7 +74,7 @@ public HomeController(
             IFeatureManager featureManager,
             IUserGroupService userGroupService,
             Microsoft.Extensions.Configuration.IConfiguration configuration)
-        : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+        : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.authConfig = authConfig;
             this.userService = userService;
@@ -215,7 +217,7 @@ public async Task<IActionResult> Index(string dashboardTrayLearningResourceType
                 this.Logger.LogInformation("User is authenticated: User is {fullname} and userId is: {lhuserid}", this.User.Identity.GetCurrentName(), this.User.Identity.GetCurrentUserId());
                 if (this.User.IsInRole("Administrator") || this.User.IsInRole("BlueUser") || this.User.IsInRole("ReadOnly") || this.User.IsInRole("BasicUser"))
                 {
-                    var learningTask = this.dashboardService.GetMyCoursesAndElearning(dashboardTrayLearningResourceType, myLearningDashboard, 1);
+                    var learningTask = this.dashboardService.GetMyCoursesAndElearning(dashboardTrayLearningResourceType, myLearningDashboard, this.CurrentUserEmail, 1);
                     var resourcesTask = this.dashboardService.GetResourcesAsync(resourceDashboard, 1);
                     var cataloguesTask = this.dashboardService.GetCataloguesAsync(catalogueDashboard, 1);
                     var userGroupsTask = this.userGroupService.UserHasCatalogueContributionPermission();
@@ -282,7 +284,7 @@ public async Task<IActionResult> LoadPage(string dashboardTrayLearningResourceTy
                     switch (dashBoardTray)
                     {
                         case "my-learning":
-                            model.MyLearnings = await this.dashboardService.GetMyCoursesAndElearning(dashboardTrayLearningResourceType, myLearningDashBoard, pageNumber);
+                            model.MyLearnings = await this.dashboardService.GetMyCoursesAndElearning(dashboardTrayLearningResourceType, myLearningDashBoard, this.CurrentUserEmail, pageNumber);
                             return this.PartialView("_MyCoursesAndElearning", model);
                         case "resources":
                             model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, pageNumber);
@@ -294,7 +296,7 @@ public async Task<IActionResult> LoadPage(string dashboardTrayLearningResourceTy
                 }
                 else
                 {
-                    var learningTask = this.dashboardService.GetMyCoursesAndElearning(dashboardTrayLearningResourceType, myLearningDashBoard, dashBoardTray == "my-learning" ? pageNumber : 1);
+                    var learningTask = this.dashboardService.GetMyCoursesAndElearning(dashboardTrayLearningResourceType, myLearningDashBoard, this.CurrentUserEmail, dashBoardTray == "my-learning" ? pageNumber : 1);
                     var resourcesTask = this.dashboardService.GetResourcesAsync(resourceDashBoard, dashBoardTray == "resources" ? pageNumber : 1);
                     var cataloguesTask = this.dashboardService.GetCataloguesAsync(catalogueDashBoard, dashBoardTray == "catalogues" ? pageNumber : 1);
                     await Task.WhenAll(learningTask, resourcesTask, cataloguesTask);
diff --git a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
index 2ffc17e13..f1bc5c20d 100644
--- a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
@@ -60,6 +60,7 @@ public class LoginWizardController : BaseController
         /// <param name="specialtyService">The specialtyService.</param>
         /// <param name="locationService">The locationService.</param>
         /// <param name="gradeService">The gradeService.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public LoginWizardController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
@@ -75,8 +76,9 @@ public LoginWizardController(
             IMultiPageFormService multiPageFormService,
             ISpecialtyService specialtyService,
             ILocationService locationService,
-            IGradeService gradeService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            IGradeService gradeService,
+            IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.userService = userService;
             this.termsAndConditionService = termsAndConditionService;
diff --git a/LearningHub.Nhs.WebUI/Controllers/MediaController.cs b/LearningHub.Nhs.WebUI/Controllers/MediaController.cs
index 4acd69e07..537fb5844 100644
--- a/LearningHub.Nhs.WebUI/Controllers/MediaController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/MediaController.cs
@@ -26,8 +26,9 @@ public class MediaController : BaseController
         /// <param name="settings">Settings.</param>
         /// <param name="httpClientFactory">Http client factory.</param>
         /// <param name="azureMediaService">Azure media services.</param>
-        public MediaController(IWebHostEnvironment hostingEnvironment, ILogger<MediaController> logger, IOptions<Settings> settings, IHttpClientFactory httpClientFactory, IAzureMediaService azureMediaService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
+        public MediaController(IWebHostEnvironment hostingEnvironment, ILogger<MediaController> logger, IOptions<Settings> settings, IHttpClientFactory httpClientFactory, IAzureMediaService azureMediaService, IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.azureMediaService = azureMediaService;
             this.logger = logger;
diff --git a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
index a91718384..13dcd7e2c 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.User;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Helpers;
     using LearningHub.Nhs.WebUI.Interfaces;
@@ -46,12 +47,14 @@ public partial class MyAccountController : BaseController
         private readonly ILocationService locationService;
         private readonly ICacheService cacheService;
         private readonly IConfiguration configuration;
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MyAccountController"/> class.
         /// </summary>
         /// <param name="hostingEnvironment">The hostingEnvironment.</param>
         /// <param name="logger">The logger.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         /// <param name="settings">The settings.</param>
         /// <param name="httpClientFactory">The httpClientFactory.</param>
         /// <param name="userService">userService.</param>
@@ -80,8 +83,9 @@ public MyAccountController(
                 ILocationService locationService,
                 IMultiPageFormService multiPageFormService,
                 ICacheService cacheService,
-                IConfiguration configuration)
-                : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+                IConfiguration configuration,
+                IMoodleBridgeApiService moodleBridgeApiService)
+                : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.userService = userService;
             this.loginWizardService = loginWizardService;
@@ -94,6 +98,7 @@ public MyAccountController(
             this.multiPageFormService = multiPageFormService;
             this.cacheService = cacheService;
             this.configuration = configuration;
+            this.moodleBridgeApiService = moodleBridgeApiService;
         }
 
         private string LoginWizardCacheKey => $"{this.CurrentUserId}:LoginWizard";
@@ -1494,12 +1499,18 @@ public async Task<IActionResult> ConfirmEmail(string token, string loctoken)
             var validationResult = await this.userService.ValidateEmailChangeTokenAsync(token, loctoken, isUserRoleUpgrade);
 
             EmailChangeValidateViewModel model = new EmailChangeValidateViewModel();
+            UpdateEmailaddressViewModel emailModel = new UpdateEmailaddressViewModel()
+            {
+                OldEmail = user.EmailAddress,
+                NewEmail = validationResult.Email,
+            };
 
             if (validationResult.Valid)
             {
                 if (isUserRoleUpgrade)
                 {
                     await this.userService.UpgradeAsFullAccessUserAsync(validationResult.UserId, validationResult.Email);
+                    await this.moodleBridgeApiService.UpdateEmail(emailModel);
                     this.ViewBag.SuccessMessage = CommonValidationErrorMessages.EmailConfirmSucessMessage;
                     model.Token = token;
                     model.Loctoken = loctoken;
@@ -1508,6 +1519,7 @@ public async Task<IActionResult> ConfirmEmail(string token, string loctoken)
                 else
                 {
                     await this.userService.UpdateUserPrimaryEmailAsync(validationResult.Email);
+                    await this.moodleBridgeApiService.UpdateEmail(emailModel);
 
                     // Add UserHistory entry
                     UserHistoryViewModel userHistory = new UserHistoryViewModel()
diff --git a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
index 3dc2fe732..9e8dc29c8 100644
--- a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
@@ -53,8 +53,9 @@ public class MyLearningController : BaseController
         /// <param name="userService">user Service.</param>
         /// <param name="pdfReportService">PDF Report Service.</param>
         /// <param name="fileService">fileService.</param>
-        public MyLearningController(IWebHostEnvironment hostingEnvironment, ILogger<ResourceController> logger, IOptions<Settings> settings, IHttpClientFactory httpClientFactory, IMyLearningService myLearningService, IResourceService resourceService, IHierarchyService hierarchyService, IUserService userService, IPDFReportService pdfReportService, IFileService fileService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
+        public MyLearningController(IWebHostEnvironment hostingEnvironment, IMoodleBridgeApiService moodleBridgeApiService, ILogger<ResourceController> logger, IOptions<Settings> settings, IHttpClientFactory httpClientFactory, IMyLearningService myLearningService, IResourceService resourceService, IHierarchyService hierarchyService, IUserService userService, IPDFReportService pdfReportService, IFileService fileService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.myLearningService = myLearningService;
             this.resourceService = resourceService;
@@ -227,7 +228,7 @@ public async Task<IActionResult> Index(MyLearningUserActivitiesViewModel learnin
                     break;
             }
 
-            var result = await this.myLearningService.GetUserRecentMyLearningActivities(myLearningRequestModel);
+            var result = await this.myLearningService.GetUserRecentMyLearningActivities(myLearningRequestModel, this.MoodleInstanceUserIds);
             var response = new MyLearningUserActivitiesViewModel(myLearningRequestModel);
 
             if (result != null)
@@ -374,7 +375,7 @@ public async Task<IActionResult> LearningHistory(MyLearningUserActivitiesViewMod
                     break;
             }
 
-            var result = await this.myLearningService.GetUserLearningHistory(myLearningRequestModel);
+            var result = await this.myLearningService.GetUserLearningHistory(myLearningRequestModel, this.MoodleInstanceUserIds);
             var response = new MyLearningUserActivitiesViewModel(myLearningRequestModel);
 
             if (result != null)
@@ -457,7 +458,7 @@ public async Task<IActionResult> DownloadActivities(MyLearningRequestModel myLea
             filter.Take = 999;
             var userDetails = await this.userService.GetCurrentUserBasicDetailsAsync();
             var response = new MyLearningUserActivitiesViewModel();
-            var result = await this.myLearningService.GetUserLearningHistory(filter);
+            var result = await this.myLearningService.GetUserLearningHistory(filter, this.MoodleInstanceUserIds);
             if (result != null)
             {
                 response.TotalCount = result.TotalCount;
@@ -611,7 +612,7 @@ public async Task<IActionResult> Certificates(MyLearningUserCertificatesViewMode
                     break;
             }
 
-            var result = await this.myLearningService.GetUserCertificateDetails(myLearningRequestModel);
+            var result = await this.myLearningService.GetUserCertificateDetails(myLearningRequestModel, this.MoodleInstanceUserIds);
             var response = new MyLearningUserCertificatesViewModel(myLearningRequestModel);
 
             if (result != null)
diff --git a/LearningHub.Nhs.WebUI/Controllers/NotificationController.cs b/LearningHub.Nhs.WebUI/Controllers/NotificationController.cs
index c5013e07f..627154c03 100644
--- a/LearningHub.Nhs.WebUI/Controllers/NotificationController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/NotificationController.cs
@@ -32,13 +32,15 @@ public class NotificationController : BaseController
         /// <param name="settings">Settings.</param>
         /// <param name="notificationService">Notification service.</param>
         /// <param name="logger">Logger.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public NotificationController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
             IOptions<Settings> settings,
             INotificationService notificationService,
+            IMoodleBridgeApiService moodleBridgeApiService,
             ILogger<NotificationController> logger)
-        : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+        : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.notificationService = notificationService;
         }
diff --git a/LearningHub.Nhs.WebUI/Controllers/OfflineController.cs b/LearningHub.Nhs.WebUI/Controllers/OfflineController.cs
index 178fa5c0b..4283d3279 100644
--- a/LearningHub.Nhs.WebUI/Controllers/OfflineController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/OfflineController.cs
@@ -26,13 +26,15 @@ public class OfflineController : BaseController
         /// <param name="logger">The logger<see cref="ILogger{AccountController}"/>.</param>
         /// <param name="settings">The settings<see cref="IOptions{Settings}"/>.</param>
         /// <param name="internalSystemService">The internalSystemService<see cref="IInternalSystemService"/>.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public OfflineController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
             ILogger<OfflineController> logger,
             IOptions<Settings> settings,
-            IInternalSystemService internalSystemService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            IInternalSystemService internalSystemService,
+            IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.internalSystemService = internalSystemService;
         }
diff --git a/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs b/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs
index f046d8680..2ec1a4c4f 100644
--- a/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs
@@ -23,6 +23,7 @@ public class OpenAthensController : BaseController
     {
         private readonly IUserService userService;
         private readonly LearningHubAuthServiceConfig authConfig;
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="OpenAthensController"/> class.
@@ -33,14 +34,16 @@ public class OpenAthensController : BaseController
         /// <param name="env">The env.</param>
         /// <param name="httpClientFactory">The http client factory.</param>
         /// <param name="settings">The settings.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public OpenAthensController(
             ILogger<OpenAthensController> logger,
             IUserService userService,
+            IMoodleBridgeApiService moodleBridgeApiService,
             LearningHubAuthServiceConfig authConfig,
             IWebHostEnvironment env,
             IHttpClientFactory httpClientFactory,
             IOptions<Settings> settings)
-            : base(env, httpClientFactory, logger, settings.Value)
+            : base(env, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.userService = userService;
             this.authConfig = authConfig;
diff --git a/LearningHub.Nhs.WebUI/Controllers/PoliciesController.cs b/LearningHub.Nhs.WebUI/Controllers/PoliciesController.cs
index 9f619e572..ef5c6e300 100644
--- a/LearningHub.Nhs.WebUI/Controllers/PoliciesController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/PoliciesController.cs
@@ -25,13 +25,15 @@ public class PoliciesController : BaseController
         /// <param name="logger">Logger.</param>
         /// <param name="settings">Settings.</param>
         /// <param name="termsAndConditionsService">Terms and conditions service.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public PoliciesController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
             ILogger<HomeController> logger,
             IOptions<Settings> settings,
-            ITermsAndConditionsService termsAndConditionsService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            ITermsAndConditionsService termsAndConditionsService,
+            IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.termsAndConditionsService = termsAndConditionsService;
         }
diff --git a/LearningHub.Nhs.WebUI/Controllers/ReportsController.cs b/LearningHub.Nhs.WebUI/Controllers/ReportsController.cs
index 4cda20cb7..c67c7a6b8 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ReportsController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ReportsController.cs
@@ -37,6 +37,7 @@ public class ReportsController : BaseController
         private readonly IMultiPageFormService multiPageFormService;
         private readonly IReportService reportService;
         private readonly IFileService fileService;
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ReportsController"/> class.
@@ -50,8 +51,9 @@ public class ReportsController : BaseController
         /// <param name="hostingEnvironment">The hostingEnvironment<see cref="IWebHostEnvironment"/>.</param>
         /// <param name="logger">The logger<see cref="ILogger{AccountController}"/>.</param>
         /// <param name="settings">settings.</param>
-        public ReportsController(IHttpClientFactory httpClientFactory, IWebHostEnvironment hostingEnvironment, ILogger<AccountController> logger, IOptions<Settings> settings, ICacheService cacheService, IMultiPageFormService multiPageFormService, IReportService reportService, ICategoryService categoryService, IFileService fileService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
+        public ReportsController(IHttpClientFactory httpClientFactory, IWebHostEnvironment hostingEnvironment, IMoodleBridgeApiService moodleBridgeApiService, ILogger<AccountController> logger, IOptions<Settings> settings, ICacheService cacheService, IMultiPageFormService multiPageFormService, IReportService reportService, ICategoryService categoryService, IFileService fileService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.cacheService = cacheService;
             this.multiPageFormService = multiPageFormService;
@@ -434,14 +436,15 @@ public async Task<IActionResult> CourseProgressReport(CourseCompletionViewModel
 
         private async Task<List<KeyValuePair<string, string>>> GetCoursesAsync()
         {
-            int categoryId = this.Settings.StatMandId;
+            ////int categoryId = this.Settings.StatMandId;
+            string categoryId = "test";
             var courses = new List<KeyValuePair<string, string>>();
             var subCategories = await this.categoryService.GetCoursesByCategoryIdAsync(categoryId);
 
-            foreach (var subCategory in subCategories.Courses)
-            {
-                courses.Add(new KeyValuePair<string, string>(subCategory.Id.ToString(), UtilityHelper.ConvertToSentenceCase(subCategory.Displayname)));
-            }
+            ////foreach (var subCategory in subCategories.Courses)
+            ////{
+            ////    courses.Add(new KeyValuePair<string, string>(subCategory.Id.ToString(), UtilityHelper.ConvertToSentenceCase(subCategory.Displayname)));
+            ////}
 
             return courses;
         }
diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index 5df61185e..00d1f0f74 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -21,6 +21,7 @@
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.StaticFiles;
+    using Microsoft.Azure.Management.Media.Models;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
     using Microsoft.FeatureManagement;
@@ -63,6 +64,7 @@ public class ResourceController : BaseController
         /// <param name="fileService">The fileService.</param>
         /// <param name="cacheService">The cacheService.</param>
         /// <param name="featureManager"> The Feature flag manager.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public ResourceController(
             IWebHostEnvironment hostingEnvironment,
             ILogger<ResourceController> logger,
@@ -79,8 +81,9 @@ public ResourceController(
             IHierarchyService hierarchyService,
             IFileService fileService,
             ICacheService cacheService,
+            IMoodleBridgeApiService moodleBridgeApiService,
             IFeatureManager featureManager)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.azureMediaService = azureMediaService;
             this.resourceService = resourceService;
diff --git a/LearningHub.Nhs.WebUI/Controllers/RoadMapController.cs b/LearningHub.Nhs.WebUI/Controllers/RoadMapController.cs
index b9bcf8a22..d34e1f280 100644
--- a/LearningHub.Nhs.WebUI/Controllers/RoadMapController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/RoadMapController.cs
@@ -1,6 +1,7 @@
 namespace LearningHub.Nhs.WebUI.Controllers
 {
     using System.Net.Http;
+    using LearningHub.Nhs.WebUI.Interfaces;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
@@ -11,6 +12,8 @@
     /// </summary>
     public class RoadMapController : BaseController
     {
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RoadMapController"/> class.
         /// </summary>
@@ -18,12 +21,14 @@ public class RoadMapController : BaseController
         /// <param name="httpClientFactory">Http client factory.</param>
         /// <param name="logger">Logger.</param>
         /// <param name="settings">Settings.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public RoadMapController(
             IWebHostEnvironment hostingEnvironment,
+            IMoodleBridgeApiService moodleBridgeApiService,
             IHttpClientFactory httpClientFactory,
             ILogger<RoadMapController> logger,
             IOptions<Configuration.Settings> settings)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
         }
 
diff --git a/LearningHub.Nhs.WebUI/Controllers/SearchController.cs b/LearningHub.Nhs.WebUI/Controllers/SearchController.cs
index 074bc39ab..3f4cf8766 100644
--- a/LearningHub.Nhs.WebUI/Controllers/SearchController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/SearchController.cs
@@ -42,6 +42,7 @@ public class SearchController : BaseController
         /// <param name="logger">The logger.</param>
         /// <param name="fileService">The fileService.</param>
         /// <param name="featureManager"> The Feature flag manager.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public SearchController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
@@ -49,8 +50,9 @@ public SearchController(
             ISearchService searchService,
             ILogger<SearchController> logger,
             IFileService fileService,
+            IMoodleBridgeApiService moodleBridgeApiService,
             IFeatureManager featureManager)
-        : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+        : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.searchService = searchService;
             this.fileService = fileService;
diff --git a/LearningHub.Nhs.WebUI/Controllers/TrackingController.cs b/LearningHub.Nhs.WebUI/Controllers/TrackingController.cs
index 4463faf73..a65d56864 100644
--- a/LearningHub.Nhs.WebUI/Controllers/TrackingController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/TrackingController.cs
@@ -14,6 +14,7 @@ namespace LearningHub.Nhs.WebUI.Controllers
     public class TrackingController : BaseController
     {
         private readonly IJsDetectionLogger jsDetectionLogger;
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TrackingController"/> class.
@@ -23,13 +24,15 @@ public class TrackingController : BaseController
         /// <param name="settings">The settings.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="jsDetectionLogger">The JsDetectionLogger.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public TrackingController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
+            IMoodleBridgeApiService moodleBridgeApiService,
             IOptions<Settings> settings,
             ILogger<TrackingController> logger,
             IJsDetectionLogger jsDetectionLogger)
-        : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+        : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.jsDetectionLogger = jsDetectionLogger;
         }
diff --git a/LearningHub.Nhs.WebUI/Controllers/UserController.cs b/LearningHub.Nhs.WebUI/Controllers/UserController.cs
index 284c2a0b9..75307e7fe 100644
--- a/LearningHub.Nhs.WebUI/Controllers/UserController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/UserController.cs
@@ -64,6 +64,7 @@ public partial class UserController : BaseController
         /// <param name="countryService">countryService.</param>
         /// <param name="regionService">regionService.</param>
         /// <param name="multiPageFormService">The multiPageFormService<see cref="IMultiPageFormService"/>.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         public UserController(
             IWebHostEnvironment hostingEnvironment,
             ILogger<ResourceController> logger,
@@ -73,8 +74,9 @@ public UserController(
             ILoginWizardService loginWizardService,
             ICountryService countryService,
             IRegionService regionService,
-            IMultiPageFormService multiPageFormService)
-            : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
+            IMultiPageFormService multiPageFormService,
+            IMoodleBridgeApiService moodleBridgeApiService)
+            : base(hostingEnvironment, httpClientFactory, logger, moodleBridgeApiService, settings.Value)
         {
             this.userService = userService;
             this.loginWizardService = loginWizardService;
diff --git a/LearningHub.Nhs.WebUI/Interfaces/ICategoryService.cs b/LearningHub.Nhs.WebUI/Interfaces/ICategoryService.cs
index 37e87d072..d3e0c4c5a 100644
--- a/LearningHub.Nhs.WebUI/Interfaces/ICategoryService.cs
+++ b/LearningHub.Nhs.WebUI/Interfaces/ICategoryService.cs
@@ -18,21 +18,21 @@ public interface ICategoryService
         /// </summary>
         /// <param name="catalogueNodeVersionId">catalogueNodeVersionId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<int> GetCatalogueVersionCategoryAsync(int catalogueNodeVersionId);
+        Task<CatalogueNodeVersionCategory> GetCatalogueVersionCategoryAsync(int catalogueNodeVersionId);
 
         /// <summary>
         /// GetCoursesByCategoryIdAsync.
         /// </summary>
         /// <param name="categoryId">categoryId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<MoodleCoursesResponseModel> GetCoursesByCategoryIdAsync(int categoryId);
+        Task<MoodleCourseResultsResponseModel> GetCoursesByCategoryIdAsync(string categoryId);
 
         /// <summary>
         /// GetSubCategoryByCategoryIdAsync.
         /// </summary>
         /// <param name="categoryId">categoryId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<List<MoodleSubCategoryResponseModel>> GetSubCategoryByCategoryIdAsync(int categoryId);
+        Task<List<SubCategoryResult>> GetSubCategoryByCategoryIdAsync(string categoryId);
 
         /// <summary>
         /// GetAllMoodleCategoriesAsync.
diff --git a/LearningHub.Nhs.WebUI/Interfaces/IDashboardService.cs b/LearningHub.Nhs.WebUI/Interfaces/IDashboardService.cs
index 811dd1133..d4ce69b83 100644
--- a/LearningHub.Nhs.WebUI/Interfaces/IDashboardService.cs
+++ b/LearningHub.Nhs.WebUI/Interfaces/IDashboardService.cs
@@ -3,6 +3,7 @@
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Dashboard;
+    using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.Moodle.API;
     using LearningHub.Nhs.WebUI.Models;
 
@@ -24,9 +25,10 @@ public interface IDashboardService
         /// </summary>
         /// <param name="dashboardTrayLearningResourceType">The dashboardTrayLearningResource type.</param>
         /// <param name="dashboardType">The dashboard type.</param>
+        /// <param name="email">The email.</param>
         /// <param name="pageNumber">The page Number.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning(string dashboardTrayLearningResourceType, string dashboardType, int pageNumber);
+        Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning(string dashboardTrayLearningResourceType, string dashboardType, string email, int pageNumber);
 
         /// <summary>
         /// GetCataloguesAsync.
diff --git a/LearningHub.Nhs.WebUI/Interfaces/IMoodleBridgeApiHttpClient.cs b/LearningHub.Nhs.WebUI/Interfaces/IMoodleBridgeApiHttpClient.cs
new file mode 100644
index 000000000..bbf712b87
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/Interfaces/IMoodleBridgeApiHttpClient.cs
@@ -0,0 +1,17 @@
+namespace LearningHub.Nhs.WebUI.Interfaces
+{
+    using System.Net.Http;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// The OpenApiHttpClient interface.
+    /// </summary>
+    public interface IMoodleBridgeApiHttpClient
+    {
+        /// <summary>
+        /// The get client.
+        /// </summary>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<HttpClient> GetClientAsync();
+    }
+}
diff --git a/LearningHub.Nhs.WebUI/Interfaces/IMoodleBridgeApiService.cs b/LearningHub.Nhs.WebUI/Interfaces/IMoodleBridgeApiService.cs
new file mode 100644
index 000000000..87cb49cf6
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/Interfaces/IMoodleBridgeApiService.cs
@@ -0,0 +1,30 @@
+namespace LearningHub.Nhs.WebUI.Interfaces
+{
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Moodle;
+    using LearningHub.Nhs.Models.Moodle.API;
+    using LearningHub.Nhs.Models.User;
+    using LearningHub.Nhs.WebUI.Models;
+    using MoodleCourseCompletionModel = LearningHub.Nhs.Models.Moodle.API.MoodleCourseCompletionModel;
+
+    /// <summary>
+    /// IMoodleApiService.
+    /// </summary>
+    public interface IMoodleBridgeApiService
+    {
+        /// <summary>
+        /// GetUserInstancesByEmailAsync.
+        /// </summary>
+        /// <param name="email">The email.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<MoodleInstanceUserIdsViewModel> GetUserInstancesByEmail(string email);
+
+        /// <summary>
+        /// UpdateEmail.
+        /// </summary>
+        /// <param name="updateEmailaddressViewModel">The updateEmailaddressViewModel.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<MoodleUpdateEmailResponseModel> UpdateEmail(UpdateEmailaddressViewModel updateEmailaddressViewModel);
+    }
+}
diff --git a/LearningHub.Nhs.WebUI/Interfaces/IMyLearningService.cs b/LearningHub.Nhs.WebUI/Interfaces/IMyLearningService.cs
index e9b584cc4..3a415f9fb 100644
--- a/LearningHub.Nhs.WebUI/Interfaces/IMyLearningService.cs
+++ b/LearningHub.Nhs.WebUI/Interfaces/IMyLearningService.cs
@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.MyLearning;
 
     /// <summary>
@@ -21,15 +22,17 @@ public interface IMyLearningService
         /// Gets the user recent my leraning activities..
         /// </summary>
         /// <param name="requestModel">The request model.</param>
+        /// <param name="moodleInstanceUserIds">The moodleInstanceUserIds.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivities(MyLearningRequestModel requestModel);
+        Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivities(MyLearningRequestModel requestModel, MoodleInstanceUserIdsViewModel moodleInstanceUserIds);
 
         /// <summary>
         /// Gets the user leraning history.
         /// </summary>
         /// <param name="requestModel">The request model.</param>
+        /// <param name="moodleInstanceUserIds">The moodleInstanceUserIds.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistory(MyLearningRequestModel requestModel);
+        Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistory(MyLearningRequestModel requestModel, MoodleInstanceUserIdsViewModel moodleInstanceUserIds);
 
         /// <summary>
         /// Gets the played segment data for the progress modal in My Learning screen.
@@ -53,8 +56,9 @@ public interface IMyLearningService
         /// Gets the user certificates.
         /// </summary>
         /// <param name="requestModel">The request model.</param>
+        /// <param name="moodleInstanceUserIds">The moodleInstanceUserIds.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetails(MyLearningRequestModel requestModel);
+        Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetails(MyLearningRequestModel requestModel, MoodleInstanceUserIdsViewModel moodleInstanceUserIds);
 
         /// <summary>
         /// Gets the resource URL for a given resource reference ID.
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index c8016ba86..9e1f484cb 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -112,7 +112,7 @@
 		<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="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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/Models/Catalogue/CatalogueIndexViewModel.cs b/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueIndexViewModel.cs
index 51c66fde4..1d9617c5a 100644
--- a/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueIndexViewModel.cs
+++ b/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueIndexViewModel.cs
@@ -57,7 +57,7 @@ public class CatalogueIndexViewModel
         /// <summary>
         /// Gets or sets the courses in the catalogue.
         /// </summary>
-        public List<MoodleSubCategoryResponseModel> SubCategories { get; set; }
+        public List<MoodleCategory> SubCategories { get; set; }
 
         /// <summary>
         /// Gets or sets the moodle categories.
diff --git a/LearningHub.Nhs.WebUI/Services/CategoryService.cs b/LearningHub.Nhs.WebUI/Services/CategoryService.cs
index b68a794ca..7179f8c37 100644
--- a/LearningHub.Nhs.WebUI/Services/CategoryService.cs
+++ b/LearningHub.Nhs.WebUI/Services/CategoryService.cs
@@ -42,18 +42,18 @@ public CategoryService(ILearningHubHttpClient learningHubHttpClient, IOpenApiHtt
         /// </summary>
         /// <param name="catalogueNodeVersionId">The catalogueNodeVersionId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        public async Task<int> GetCatalogueVersionCategoryAsync(int catalogueNodeVersionId)
+        public async Task<CatalogueNodeVersionCategory> GetCatalogueVersionCategoryAsync(int catalogueNodeVersionId)
         {
+            CatalogueNodeVersionCategory catalogueNodeVersionCategory = new CatalogueNodeVersionCategory { };
             var client = await this.OpenApiHttpClient.GetClientAsync();
 
             var request = $"category/GetCatalogueVersionCategory/{catalogueNodeVersionId}";
             var response = await client.GetAsync(request).ConfigureAwait(false);
-            var categoryId = 0;
 
             if (response.IsSuccessStatusCode)
             {
                 var result = response.Content.ReadAsStringAsync().Result;
-                categoryId = Convert.ToInt32(result);
+                catalogueNodeVersionCategory = JsonConvert.DeserializeObject<CatalogueNodeVersionCategory>(result);
             }
             else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized ||
                        response.StatusCode == System.Net.HttpStatusCode.Forbidden)
@@ -61,7 +61,7 @@ public async Task<int> GetCatalogueVersionCategoryAsync(int catalogueNodeVersion
                 throw new Exception("AccessDenied");
             }
 
-            return categoryId;
+            return catalogueNodeVersionCategory;
         }
 
         /// <summary>
@@ -69,9 +69,9 @@ public async Task<int> GetCatalogueVersionCategoryAsync(int catalogueNodeVersion
         /// </summary>
         /// <param name="categoryId">The categoryId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        public async Task<List<MoodleSubCategoryResponseModel>> GetSubCategoryByCategoryIdAsync(int categoryId)
+        public async Task<List<SubCategoryResult>> GetSubCategoryByCategoryIdAsync(string categoryId)
         {
-            List<MoodleSubCategoryResponseModel> viewmodel = new List<MoodleSubCategoryResponseModel> { };
+            List<SubCategoryResult> viewmodel = new List<SubCategoryResult> { };
 
             var client = await this.OpenApiHttpClient.GetClientAsync();
 
@@ -81,7 +81,7 @@ public async Task<List<MoodleSubCategoryResponseModel>> GetSubCategoryByCategory
             if (response.IsSuccessStatusCode)
             {
                 var result = response.Content.ReadAsStringAsync().Result;
-                viewmodel = JsonConvert.DeserializeObject<List<MoodleSubCategoryResponseModel>>(result);
+                viewmodel = JsonConvert.DeserializeObject<List<SubCategoryResult>>(result);
             }
             else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized ||
                        response.StatusCode == System.Net.HttpStatusCode.Forbidden)
@@ -97,9 +97,9 @@ public async Task<List<MoodleSubCategoryResponseModel>> GetSubCategoryByCategory
         /// </summary>
         /// <param name="categoryId">The categoryId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        public async Task<MoodleCoursesResponseModel> GetCoursesByCategoryIdAsync(int categoryId)
+        public async Task<MoodleCourseResultsResponseModel> GetCoursesByCategoryIdAsync(string categoryId)
         {
-            MoodleCoursesResponseModel viewmodel = new MoodleCoursesResponseModel { };
+            MoodleCourseResultsResponseModel viewmodel = new MoodleCourseResultsResponseModel { };
 
             var client = await this.OpenApiHttpClient.GetClientAsync();
 
@@ -109,7 +109,7 @@ public async Task<MoodleCoursesResponseModel> GetCoursesByCategoryIdAsync(int ca
             if (response.IsSuccessStatusCode)
             {
                 var result = response.Content.ReadAsStringAsync().Result;
-                viewmodel = JsonConvert.DeserializeObject<MoodleCoursesResponseModel>(result);
+                viewmodel = JsonConvert.DeserializeObject<MoodleCourseResultsResponseModel>(result);
             }
             else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized ||
                        response.StatusCode == System.Net.HttpStatusCode.Forbidden)
diff --git a/LearningHub.Nhs.WebUI/Services/DashboardService.cs b/LearningHub.Nhs.WebUI/Services/DashboardService.cs
index d201da1f2..1412dcc9b 100644
--- a/LearningHub.Nhs.WebUI/Services/DashboardService.cs
+++ b/LearningHub.Nhs.WebUI/Services/DashboardService.cs
@@ -2,11 +2,14 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Net.Http.Json;
     using System.Text;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Dashboard;
     using LearningHub.Nhs.Models.Entities.Analytics;
+    using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.Moodle.API;
+    using LearningHub.Nhs.Models.MyLearning;
     using LearningHub.Nhs.WebUI.Interfaces;
     using LearningHub.Nhs.WebUI.Models;
     using Microsoft.Extensions.Logging;
@@ -66,16 +69,25 @@ public async Task<DashboardMyLearningResponseViewModel> GetMyAccessLearningsAsyn
         /// </summary>
         /// <param name="dashboardTrayLearningResourceType">The dashboard Tray Learning Resource type.</param>
         /// <param name="dashboardType">The dashboard type.</param>
+        /// <param name="email">The email.</param>
         /// <param name="pageNumber">The page Number.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        public async Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning(string dashboardTrayLearningResourceType, string dashboardType, int pageNumber)
+        public async Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning(string dashboardTrayLearningResourceType, string dashboardType, string email, int pageNumber)
         {
             DashboardMyLearningResponseViewModel viewmodel = new DashboardMyLearningResponseViewModel { };
 
             var client = await this.OpenApiHttpClient.GetClientAsync();
+            var request = new GetMyCoursesAndElearningRequestModel
+            {
+                DashboardTrayLearningResourceType = dashboardTrayLearningResourceType,
+                DashboardType = dashboardType,
+                Email = email,
+                PageNumber = pageNumber,
+            };
 
-            var request = $"dashboard/GetMyCoursesAndElearning/{dashboardTrayLearningResourceType}/{dashboardType}/{pageNumber}";
-            var response = await client.GetAsync(request).ConfigureAwait(false);
+            //// var request = $"dashboard/GetMyCoursesAndElearning/{dashboardTrayLearningResourceType}/{dashboardType}/{email}/{pageNumber}";
+            //// var response = await client.GetAsync(request).ConfigureAwait(false);
+            var response = await client.PostAsJsonAsync("dashboard/GetMyCoursesAndElearning", request);
 
             if (response.IsSuccessStatusCode)
             {
diff --git a/LearningHub.Nhs.WebUI/Services/MoodleBridgeApiHttpClient.cs b/LearningHub.Nhs.WebUI/Services/MoodleBridgeApiHttpClient.cs
new file mode 100644
index 000000000..04f91cdd8
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/Services/MoodleBridgeApiHttpClient.cs
@@ -0,0 +1,41 @@
+namespace LearningHub.Nhs.WebUI.Services
+{
+    using System.Net.Http;
+    using LearningHub.Nhs.Caching;
+    using LearningHub.Nhs.WebUI.Configuration;
+    using LearningHub.Nhs.WebUI.Interfaces;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Options;
+
+    /// <summary>
+    /// The open api http client.
+    /// </summary>
+    public class MoodleBridgeApiHttpClient : BaseHttpClient, IOpenApiHttpClient
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MoodleBridgeApiHttpClient"/> class.
+        /// </summary>
+        /// <param name="httpContextAccessor">The http context accessor.</param>
+        /// <param name="webSettings">The web settings.</param>
+        /// <param name="authConfig">The auth config.</param>
+        /// <param name="client">The http client.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="cacheService">The cache service.</param>
+        public MoodleBridgeApiHttpClient(
+            IHttpContextAccessor httpContextAccessor,
+            IOptions<Settings> webSettings,
+            LearningHubAuthServiceConfig authConfig,
+            HttpClient client,
+            ILogger<OpenApiHttpClient> logger,
+            ICacheService cacheService)
+            : base(httpContextAccessor, webSettings.Value, authConfig, client, logger, cacheService)
+        {
+        }
+
+        /// <summary>
+        /// Gets the open api url.
+        /// </summary>
+        public override string ApiUrl => this.WebSettings.OpenApiUrl;
+    }
+}
diff --git a/LearningHub.Nhs.WebUI/Services/MoodleBridgeApiService.cs b/LearningHub.Nhs.WebUI/Services/MoodleBridgeApiService.cs
new file mode 100644
index 000000000..6cd57f10c
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/Services/MoodleBridgeApiService.cs
@@ -0,0 +1,109 @@
+namespace LearningHub.Nhs.WebUI.Services
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http.Json;
+    using System.Text.Json;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Moodle;
+    using LearningHub.Nhs.Models.Moodle.API;
+    using LearningHub.Nhs.Models.User;
+    using LearningHub.Nhs.WebUI.Configuration;
+    using LearningHub.Nhs.WebUI.Interfaces;
+    using LearningHub.Nhs.WebUI.Models;
+    using Microsoft.Extensions.Options;
+    using Newtonsoft.Json;
+
+    /// <summary>
+    /// MoodleApiService.
+    /// </summary>
+    public class MoodleBridgeApiService : IMoodleBridgeApiService
+    {
+        private readonly IOpenApiHttpClient openApiHttpClient;
+       //// private readonly MoodleBridgeApiConfig configuration;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MoodleBridgeApiService"/> class.
+        /// </summary>
+        /// <param name="openApiHttpClient">The open Api Http Client.</param>
+        public MoodleBridgeApiService(IOpenApiHttpClient openApiHttpClient)
+        {
+            this.openApiHttpClient = openApiHttpClient;
+            ////this.configuration = configuration.Value;
+        }
+
+        /// <summary>
+        /// GetUserInstancesByEmailAsync.
+        /// </summary>
+        /// <param name="email">The email.</param>
+        /// <returns>UserId from Moodle.</returns>
+        public async Task<MoodleInstanceUserIdsViewModel> GetUserInstancesByEmail(string email)
+        {
+            MoodleInstanceUserIdsViewModel viewmodel = null;
+
+            try
+            {
+                var client = await this.openApiHttpClient.GetClientAsync();
+
+                var request = $"MoodleBridge/GetUserInstancesByEmail/{email}";
+                var response = await client.GetAsync(request).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = response.Content.ReadAsStringAsync().Result;
+                    viewmodel = JsonConvert.DeserializeObject<MoodleInstanceUserIdsViewModel>(result);
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                return viewmodel;
+            }
+            catch (Exception ex)
+            {
+                return viewmodel;
+            }
+        }
+
+        /// <summary>
+        /// UpdateEmail.
+        /// </summary>
+        /// <param name="updateEmailaddressViewModel">The updateEmailaddressViewModel.</param>
+        /// <returns>email update status.</returns>
+        public async Task<MoodleUpdateEmailResponseModel> UpdateEmail(UpdateEmailaddressViewModel updateEmailaddressViewModel)
+        {
+            try
+            {
+                var client = await this.openApiHttpClient.GetClientAsync();
+
+                var requestUrl = "MoodleBridge/UpdateEmail";
+
+                var response = await client.PostAsJsonAsync(requestUrl, updateEmailaddressViewModel)
+                                           .ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var viewModel = await response.Content
+                                                  .ReadFromJsonAsync<MoodleUpdateEmailResponseModel>();
+
+                    return viewModel;
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized ||
+                         response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+                else
+                {
+                    var errorContent = await response.Content.ReadAsStringAsync();
+                    throw new Exception($"API Error: {response.StatusCode}, Details: {errorContent}");
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception("Failed to update user email on moodle instances");
+            }
+        }
+    }
+}
diff --git a/LearningHub.Nhs.WebUI/Services/MyLearningService.cs b/LearningHub.Nhs.WebUI/Services/MyLearningService.cs
index cb75f1530..2014a2af0 100644
--- a/LearningHub.Nhs.WebUI/Services/MyLearningService.cs
+++ b/LearningHub.Nhs.WebUI/Services/MyLearningService.cs
@@ -5,9 +5,11 @@
     using System.Net.Http;
     using System.Text;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.MyLearning;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Interfaces;
+    using LearningHub.Nhs.WebUI.Models;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
     using Newtonsoft.Json;
@@ -68,12 +70,19 @@ public async Task<MyLearningDetailedViewModel> GetActivityDetailed(MyLearningReq
         /// Gets the user recent my leraning activities.
         /// </summary>
         /// <param name="requestModel">The request model.</param>
+        /// <param name="moodleInstanceUserIds">The moodleInstanceUserIds.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivities(MyLearningRequestModel requestModel)
+        public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivities(MyLearningRequestModel requestModel, MoodleInstanceUserIdsViewModel moodleInstanceUserIds)
         {
             MyLearningActivitiesDetailedViewModel viewModel = null;
 
-            var json = JsonConvert.SerializeObject(requestModel);
+            var payload = new MyLearningApiRequestViewModel
+            {
+                Request = requestModel,
+                MoodleInstanceUserIds = moodleInstanceUserIds,
+            };
+
+            var json = JsonConvert.SerializeObject(payload);
             var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
             var client = await this.OpenApiHttpClient.GetClientAsync();
@@ -83,7 +92,7 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearning
 
             if (response.IsSuccessStatusCode)
             {
-                var result = response.Content.ReadAsStringAsync().Result;
+                var result = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 viewModel = JsonConvert.DeserializeObject<MyLearningActivitiesDetailedViewModel>(result);
             }
             else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
@@ -100,12 +109,18 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearning
         /// Gets the user recent my leraning activities.
         /// </summary>
         /// <param name="requestModel">The request model.</param>
+        /// <param name="moodleInstanceUserIds">The moodleInstanceUserIds.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistory(MyLearningRequestModel requestModel)
+        public async Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistory(MyLearningRequestModel requestModel, MoodleInstanceUserIdsViewModel moodleInstanceUserIds)
         {
             MyLearningActivitiesDetailedViewModel viewModel = null;
+            var payload = new MyLearningApiRequestViewModel
+            {
+                Request = requestModel,
+                MoodleInstanceUserIds = moodleInstanceUserIds,
+            };
 
-            var json = JsonConvert.SerializeObject(requestModel);
+            var json = JsonConvert.SerializeObject(payload);
             var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
             var client = await this.OpenApiHttpClient.GetClientAsync();
@@ -192,12 +207,17 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
         /// Gets the user certificates.
         /// </summary>
         /// <param name="requestModel">The request model.</param>
+        /// <param name="moodleInstanceUserIds">The moodleInstanceUserIds.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetails(MyLearningRequestModel requestModel)
+        public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetails(MyLearningRequestModel requestModel, MoodleInstanceUserIdsViewModel moodleInstanceUserIds)
         {
             MyLearningCertificatesDetailedViewModel viewModel = null;
-
-            var json = JsonConvert.SerializeObject(requestModel);
+            var payload = new MyLearningApiRequestViewModel
+            {
+                Request = requestModel,
+                MoodleInstanceUserIds = moodleInstanceUserIds,
+            };
+            var json = JsonConvert.SerializeObject(payload);
             var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
 
             var client = await this.OpenApiHttpClient.GetClientAsync();
diff --git a/LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs b/LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs
index 60ff5f634..589eea428 100644
--- a/LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs
+++ b/LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs
@@ -101,6 +101,7 @@ public static void AddLearningHubMappings(this IServiceCollection services, ICon
             services.AddSingleton<IMyLearningService, MyLearningService>();
             services.AddSingleton<IDashboardService, DashboardService>();
             services.AddSingleton<IMoodleApiService, MoodleApiService>();
+            services.AddSingleton<IMoodleBridgeApiService, MoodleBridgeApiService>();
             services.AddSingleton<IContentService, ContentService>();
             services.AddScoped<IPartialFileUploadService, PartialFileUploadService>();
             services.AddScoped<IRoleService, RoleService>();
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Courses.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Courses.cshtml
index f8c67dc63..57dc0839c 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Courses.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Courses.cshtml
@@ -15,12 +15,12 @@
     <div class="nhsuk-width-container app-width-container">
         <div class="nhsuk-grid-row nhsuk-u-padding-top-7 nhsuk-u-padding-bottom-5">
             <h2>Courses</h2>
-            @foreach (MoodleSubCategoryResponseModel item in Model.SubCategories)
+            @foreach (MoodleCategory item in Model.SubCategories)
             {
                 <div class="nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-2">
                     <h2 class="folder-title line-clamp-2">
                         <img src="/images/folder-icon.svg" alt="folder icon" />
-                        <a asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-moodleCategoryId="@item.Id">@Html.Raw(@item.Name)</a>
+                        <a asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-categoryId="@item.Id">@Html.Raw(@item.Name)</a>
                     </h2>
                 </div>
                 <hr class="nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-0" />
@@ -28,7 +28,7 @@
             @foreach (Course item in Model.Courses)
             {
                 <div class="nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-2">
-                    <h2 class="nhsuk-u-reading-width line-clamp-2"><a class="nhsuk-u-font-size-19" href="@GetMoodleCourseUrl(item.Id)">@item.Displayname</a></h2>
+                    <h2 class="nhsuk-u-reading-width line-clamp-2"><a class="nhsuk-u-font-size-19" href="@item.CourseUrl">@item.Displayname</a></h2>
                     <div class="nhsuk-u-padding-right-5 nhsuk-u-padding-bottom-5">
                         <div class="nhsuk-u-padding-right-5 nhsuk-u-padding-bottom-3"><span class="nhsuk-u-font-weight-bold nhsuk-u-padding-right-2">Type:</span> Course</div>
                         <div class="line-clamp-3">
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
index 1384acfb9..d08f7769d 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
@@ -57,8 +57,8 @@
 
     if (ViewBag.ActiveTab == "courses")
     {
-        if (Model.Catalogue.SelectedCategoryId == 0 ||
-         (Model.Catalogue.SelectedCategoryId > 0 &&
+        if (Model.Catalogue.SelectedCategoryId == null ||
+         (Model.Catalogue.SelectedCategoryId != null &&
           (Model.Courses == null || !Model.Courses.Any()) &&
           (Model.SubCategories == null || !Model.SubCategories.Any())))
         {
@@ -71,7 +71,7 @@
     {
         breadcrumbs = UtilityHelper.GetBreadcrumbsForFolderNodes(Model.NodePathNodes.SkipLast(1).ToList(), Model.Catalogue.Url);
     }
-    else if (ViewBag.ActiveTab == "courses" && Model.Catalogue.SelectedCategoryId > 0)
+    else if (ViewBag.ActiveTab == "courses" && Model.Catalogue.SelectedCategoryId !=null)
     {
         breadcrumbs = UtilityHelper.GetBreadcrumbsForCourses(Model.MoodleCategories, Model.Catalogue.Url);
     }
@@ -205,7 +205,7 @@
                             <a tabindex="0" class="subnavwhite-link text-nowrap" asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-tab="browse" asp-fragment="catalogue-details">Resources</a>
                         </li>
                     }
-                    @if (Model.Catalogue.SelectedCategoryId > 0 &&
+                    @if (Model.Catalogue.SelectedCategoryId != null &&
                     (
                     (Model.Courses != null && Model.Courses.Any()) ||
                     (Model.SubCategories != null && Model.SubCategories.Any())
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml
index 799c4169d..af55e1c58 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml
@@ -29,7 +29,7 @@
 
                 @if (ViewActivityHelper.GetResourceTypeDesc(Model.Item2.ResourceType) == "Course")
                 {
-                    <a class="nhsuk-u-font-size-19 nhsuk-card__link" href="@GetMoodleCourseUrl(Model.Item2.ResourceId)">@Model.Item2.Title</a>
+                        <a class="nhsuk-u-font-size-19 nhsuk-card__link" href="@Model.Item2.ResourceUrl">@Model.Item2.Title</a>
                 }
                 else
                 {
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml
index 8923e8e24..dc5880065 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_MyCoursesAndElearning.cshtml
@@ -93,7 +93,7 @@
                                 <partial name="_LearningActivityCard" model="activityViewModel" />
                             </li>
                         }
-                        @if (isLastPage && pagingViewModel.TotalCount >=8)
+                        @if (isLastPage && pagingViewModel.TotalCount >= 8)
                         {
                             <li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">
                                 <div class="nhsuk-card dashboard-card">
@@ -190,16 +190,27 @@
             else
             {
                 <div class="nhsuk-bg-white  nhsuk-u-padding-5">
-                    @if (Model.MyLearnings.Type == "my-in-progress" && Model.MyLearnings.TotalCount <= 0)
+                    @if (Model.MyLearnings.Type == "my-certificates" && Model.MyLearnings.TotalCount <= 0)
+                    {
+                        <h3 nhsuk-card__heading nhsuk-heading-m>You have no certificates.</h3>
+                        <p class="nhsuk-card__description dashboard-card-body">Certificates when available will be displayed here.</p>
+                    }
+                    else if (Model.DashboardTrayLearningResourceType == "elearning" && Model.MyLearnings.TotalCount <= 0)
                     {
                         <h3 class="nhsuk-card__heading nhsuk-heading-m">You have not accessed any learning yet.</h3>
                         <p class="nhsuk-card__description dashboard-card-body">Accessed resources and courses will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
                     }
-                    else if (Model.MyLearnings.Type == "my-certificates" && Model.MyLearnings.TotalCount <= 0)
+                    else if (Model.DashboardTrayLearningResourceType == "courses" && Model.MyLearnings.TotalCount <= 0)
                     {
-                        <h3 nhsuk-card__heading nhsuk-heading-m>You have no certificates.</h3>
-                        <p class="nhsuk-card__description dashboard-card-body">Certificates when available will be displayed here.</p>
+                        <h3 class="nhsuk-card__heading nhsuk-heading-m">You have not accessed any coursees yet.</h3>
+                        <p class="nhsuk-card__description dashboard-card-body">Accessed resources and courses will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
+                    }
+                    else if (Model.DashboardTrayLearningResourceType == "all" && Model.MyLearnings.TotalCount <= 0)
+                    {
+                        <h3 class="nhsuk-card__heading nhsuk-heading-m">You have not accessed any learning yet.</h3>
+                        <p class="nhsuk-card__description dashboard-card-body">Accessed resources and courses will be displayed here. Browse from the list of resources below or search for a specific term using the search bar at the top of the screen.</p>
                     }
+
                 </div>
             }
         </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_ResourceTray.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_ResourceTray.cshtml
index b17ea20fb..0d812f20c 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_ResourceTray.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_ResourceTray.cshtml
@@ -69,9 +69,9 @@
 
     <div class="nhsuk-grid-row">
         <div class="nhsuk-grid-column-full">
-            <ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred nhsuk-u-margin-bottom-2">
-                @if (@Model.Resources.Resources != null)
-                {
+            @if (@Model.Resources.Resources.Count() > 0)
+            {
+                <ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred nhsuk-u-margin-bottom-2">
                     @foreach (var resource in Model.Resources.Resources)
                     {
                         var resourceViewModel = new Tuple<string, DashboardResourceViewModel>("resources", resource);
@@ -79,8 +79,16 @@
                             <partial name="_ResourceCard" model="resourceViewModel" />
                         </li>
                     }
+                </ul>
+            }
+            else
+            {
+                if (Model.Resources.Type == "my-recent-completed")
+                {
+                    <h3 nhsuk-card__heading nhsuk-heading-m>You have not recently completed any learning.</h3>
+                    <p class="nhsuk-card__description dashboard-card-body">When available your completed learning will be displayed here.</p>
                 }
-            </ul>
+            }
         </div>
     </div>
     <div class="nhsuk-grid-row">
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/DownloadActivityRecords.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/DownloadActivityRecords.cshtml
index c19e702e6..725c77b81 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/DownloadActivityRecords.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/DownloadActivityRecords.cshtml
@@ -1133,7 +1133,7 @@
                                 <span class="nhsuk-u-padding-bottom-3">
                                     @if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
                                     {
-                                        <a class="nhsuk-u-font-size-19" href="@GetMoodleCourseUrl(activity.ResourceId)">@activity.Title</a>
+                                        <a class="nhsuk-u-font-size-19" href="@activity.ResourceUrl">@activity.Title</a>
                                     }
                                     else
                                     {
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml
index 5dc2d9990..b446f36d5 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml
@@ -121,7 +121,7 @@
                             <span class="nhsuk-u-padding-bottom-3">
                                 @if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
                                 {
-                                    <a class="nhsuk-u-font-size-19" href="@GetMoodleCourseUrl(activity.ResourceId)">@activity.Title</a>
+                                        <a class="nhsuk-u-font-size-19" href="@activity.ResourceUrl">@activity.Title</a>
                                 }
                                 else
                                 {
@@ -140,17 +140,17 @@
                                         <span class="nhsuk-u-padding-right-2 nhsuk-u-font-size-16 @accessedLabelClass nhsuk-u-font-weight-bold">
                                             @displayText:
                                         </span>
-                                        @if(isCompleted)
+                                        @if (isCompleted)
                                         {
-                                        <span class="nhsuk-u-font-size-16 @accessedLabelClass">
-                                            @certificateAwardedText
-                                        </span>
+                                            <span class="nhsuk-u-font-size-16 @accessedLabelClass">
+                                                @certificateAwardedText
+                                            </span>
                                         }
                                         else
                                         {
-                                        <span class="nhsuk-u-font-size-16 @accessedLabelClass">
-                                            @dateTimeText
-                                        </span>
+                                            <span class="nhsuk-u-font-size-16 @accessedLabelClass">
+                                                @dateTimeText
+                                            </span>
                                         }
                                     </div>
                                     <div>
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml
index d8410924f..d8bc1e4c7 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml
@@ -57,7 +57,7 @@
                 <div class="nhsuk-u-padding-top-3">
                     @if (errorHasOccurred)
                     {
-                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
+                        <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
                     }
                     <p class="nhsuk-body-m">
                         You can use this page to search and filter learning resources you've accessed and generate a report
@@ -81,13 +81,13 @@
                     </p>
                     @if (Model.TotalCount != 0)
                     {
-                    <form method="post" asp-controller="MyLearning" asp-action="DownloadActivities" asp-all-route-data="@routeData">
-                        <button class="nhsuk-button" type="submit">Download PDF</button>
-                    </form>
+                        <form method="post" asp-controller="MyLearning" asp-action="DownloadActivities" asp-all-route-data="@routeData">
+                            <button class="nhsuk-button" type="submit">Download PDF</button>
+                        </form>
                     }
                     else
                     {
-                    <button class="nhsuk-button" disabled="disabled">Download PDF</button>
+                        <button class="nhsuk-button" disabled="disabled">Download PDF</button>
                     }
 
                     <form asp-controller="MyLearning" asp-action="LearningHistory" method="post" asp-fragment="search-results">
@@ -180,131 +180,131 @@
                         var dateTimeText = activityDate == today ? "Today"
                         : activityDate == today.AddDays(-1) ? "Yesterday"
                         : activityDate.ToString("dd MMM yyyy");
-                     var certicateAwardedDate = activity.CertificateAwardedDate.Date;
- var certificateAwardedText = certicateAwardedDate == today ? "Today"
- : certicateAwardedDate == today.AddDays(-1) ? "Yesterday"
- : certicateAwardedDate.ToString("dd MMM yyyy");
+                        var certicateAwardedDate = activity.CertificateAwardedDate.Date;
+                        var certificateAwardedText = certicateAwardedDate == today ? "Today"
+                        : certicateAwardedDate == today.AddDays(-1) ? "Yesterday"
+                        : certicateAwardedDate.ToString("dd MMM yyyy");
 
-                    <div>
-                        <span class="nhsuk-u-padding-bottom-3">
-                            @if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
+                        <div>
+                            <span class="nhsuk-u-padding-bottom-3">
+                                @if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
                                 {
-                            <a class="nhsuk-u-font-size-19" href="@GetMoodleCourseUrl(activity.ResourceId)">@activity.Title</a>
+                                        <a class="nhsuk-u-font-size-19" href="@activity.ResourceUrl">@activity.Title</a>
                                 }
                                 else
                                 {
-                            <a class="nhsuk-u-font-size-19" asp-controller="Resource" asp-action="Index" asp-route-resourceReferenceId="@activity.ResourceReferenceId">@activity.Title</a>
+                                    <a class="nhsuk-u-font-size-19" asp-controller="Resource" asp-action="Index" asp-route-resourceReferenceId="@activity.ResourceReferenceId">@activity.Title</a>
                                 }
-                        </span>
-                        <div>
-                            <div class="nhs-item-row nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-2">
-                                <div>
-                                    <span class="@typeLabelClass nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-padding-right-2">Type:</span>
+                            </span>
+                            <div>
+                                <div class="nhs-item-row nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-2">
+                                    <div>
+                                        <span class="@typeLabelClass nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-padding-right-2">Type:</span>
 
-                                    <span class="nhsuk-u-padding-right-3  nhsuk-u-font-size-16 @typeLabelClass">
-                                        @ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType)
-                                    </span>
+                                        <span class="nhsuk-u-padding-right-3  nhsuk-u-font-size-16 @typeLabelClass">
+                                            @ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType)
+                                        </span>
 
-                                    <span class="nhsuk-u-padding-right-2 nhsuk-u-font-size-16 @accessedLabelClass nhsuk-u-font-weight-bold">
-                                        @displayText:
-                                    </span>
-                                    @if(isCompleted)
-                                    {
-                                        <span class="nhsuk-u-font-size-16 @accessedLabelClass">
-                                            @certificateAwardedText
+                                        <span class="nhsuk-u-padding-right-2 nhsuk-u-font-size-16 @accessedLabelClass nhsuk-u-font-weight-bold">
+                                            @displayText:
                                         </span>
-                                    }
-                                    else
-                                    {
-                                    <span class="nhsuk-u-font-size-16 @accessedLabelClass">
-                                        @dateTimeText
-                                    </span>
-                                    }
-                                </div>
-                                <div>
-                                    <span class="nhsuk-u-text-align-left  table-content-spacing">
-                                        <strong class="nhsuk-tag @tagColorClass">
-                                            @statusText
-                                        </strong>
-                                    </span>
+                                        @if (isCompleted)
+                                        {
+                                            <span class="nhsuk-u-font-size-16 @accessedLabelClass">
+                                                @certificateAwardedText
+                                            </span>
+                                        }
+                                        else
+                                        {
+                                            <span class="nhsuk-u-font-size-16 @accessedLabelClass">
+                                                @dateTimeText
+                                            </span>
+                                        }
+                                    </div>
+                                    <div>
+                                        <span class="nhsuk-u-text-align-left  table-content-spacing">
+                                            <strong class="nhsuk-tag @tagColorClass">
+                                                @statusText
+                                            </strong>
+                                        </span>
+                                    </div>
                                 </div>
-                            </div>
-                            @if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
+                                @if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
                                 {
-                            <div class="nhs-progress-container" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-                                <div class="nhs-progress-bar" style="width: @(activity.ScorePercentage)%"></div>
-                            </div>
+                                    <div class="nhs-progress-container" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+                                        <div class="nhs-progress-bar" style="width: @(activity.ScorePercentage)%"></div>
+                                    </div>
                                 }
                                 else @if (ViewActivityHelper.CanViewVidoProgress(activity))
                                 {
-                            <div class="nhsuk-u-padding-top-1">
-                                @activity.CompletionPercentage% complete
-                                <a asp-controller="MyLearning" asp-action="ViewProgress" asp-route-resourceId="@activity.ResourceId" asp-route-version="@activity.MajorVersion" asp-route-maxTime="@activity.ResourceDurationMilliseconds" asp-route-returnUrl="@returnUrl" asp-route-resourceReferenceId="@activity.ResourceReferenceId">View Progress</a>
-                            </div>
+                                    <div class="nhsuk-u-padding-top-1">
+                                        @activity.CompletionPercentage% complete
+                                        <a asp-controller="MyLearning" asp-action="ViewProgress" asp-route-resourceId="@activity.ResourceId" asp-route-version="@activity.MajorVersion" asp-route-maxTime="@activity.ResourceDurationMilliseconds" asp-route-returnUrl="@returnUrl" asp-route-resourceReferenceId="@activity.ResourceReferenceId">View Progress</a>
+                                    </div>
                                 }
 
 
                                 @if (ViewActivityHelper.CanCertificateawarded(activity))
                                 {
 
-                                <div class="nhsuk-u-padding-bottom-5 nhsuk-u-padding-top-4 nhsuk-u-font-size-16">
-                                    <svg xmlns="http://www.w3.org/2000/svg" width="19" height="24" viewBox="0 0 19 24" fill="none">
-                                        <g clip-path="url(#clip0_4164_3951)">
-                                            <path d="M13.3598 18.9737V23.1883C13.3598 23.4148 12.7512 23.5225 12.4233 23.3543L9.57333 21.8784C9.35548 21.7662 8.97144 21.7685 8.76034 21.8851L6.18212 23.3139C5.86096 23.4911 5.23438 23.3879 5.23438 23.1546V17.6055" stroke="#007F3B" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
-                                            <path d="M18.0346 9.08368C18.0346 9.70947 16.9027 10.2007 16.768 10.7884C16.6332 11.376 17.435 12.327 17.17 12.8721C16.9049 13.4171 15.6675 13.379 15.2857 13.8568C14.9039 14.3345 15.2228 15.5255 14.7422 15.9091C14.2616 16.2927 13.1746 15.714 12.6176 15.9831C12.0607 16.2523 11.8428 17.459 11.2365 17.5958C10.6301 17.7327 9.91816 16.739 9.29157 16.739C8.66498 16.739 7.93284 17.7304 7.34668 17.5958C6.76051 17.4613 6.51347 16.2456 5.96549 15.9831C5.4175 15.7207 4.31929 16.2904 3.84093 15.9091C3.36257 15.5278 3.68147 14.3368 3.29744 13.8568C2.9134 13.3768 1.68268 13.4284 1.41543 12.8721C1.14817 12.3158 1.95443 11.394 1.81743 10.7884C1.68044 10.1827 0.550781 9.71172 0.550781 9.08368C0.550781 8.45564 1.68268 7.96667 1.81743 7.37901C1.95218 6.79134 1.15042 5.84032 1.41543 5.29527C1.68044 4.75022 2.91789 4.78835 3.29968 4.3106C3.68147 3.83284 3.36257 2.64181 3.84317 2.25826C4.32378 1.87471 5.41077 2.4534 5.96773 2.18424C6.5247 1.91508 6.74255 0.708352 7.34892 0.57153C7.9553 0.434707 8.66723 1.42835 9.29381 1.42835C9.9204 1.42835 10.6525 0.43695 11.2387 0.57153C11.8249 0.706109 12.0719 1.92181 12.6199 2.18424C13.1679 2.44667 14.2661 1.87695 14.7445 2.25826C15.2228 2.63957 14.9039 3.8306 15.2879 4.3106C15.672 4.7906 16.9027 4.73901 17.17 5.29527C17.4372 5.85153 16.631 6.7734 16.768 7.37901C16.9049 7.98461 18.0346 8.45564 18.0346 9.08368Z" fill="#007F3B" />
-                                            <path d="M18.0346 9.08368C18.0346 9.70947 16.9027 10.2007 16.768 10.7884C16.6332 11.376 17.435 12.327 17.17 12.8721C16.9049 13.4171 15.6675 13.379 15.2857 13.8568C14.9039 14.3345 15.2228 15.5255 14.7422 15.9091C14.2616 16.2927 13.1746 15.714 12.6176 15.9831C12.0607 16.2523 11.8428 17.459 11.2365 17.5958C10.6301 17.7327 9.91816 16.739 9.29157 16.739C8.66498 16.739 7.93284 17.7304 7.34668 17.5958C6.76051 17.4612 6.51347 16.2455 5.96549 15.9831C5.4175 15.7207 4.31929 16.2904 3.84093 15.9091C3.36257 15.5278 3.68147 14.3368 3.29744 13.8568C2.9134 13.3768 1.68268 13.4284 1.41543 12.8721C1.14817 12.3158 1.95443 11.394 1.81743 10.7884C1.68044 10.1827 0.550781 9.71172 0.550781 9.08368C0.550781 8.45564 1.68268 7.96667 1.81743 7.37901C1.95218 6.79134 1.15042 5.84032 1.41543 5.29527C1.68044 4.75022 2.91789 4.78835 3.29968 4.3106C3.68147 3.83284 3.36257 2.64181 3.84317 2.25826C4.32378 1.87471 5.41077 2.4534 5.96773 2.18424C6.5247 1.91508 6.74255 0.708352 7.34892 0.57153C7.9553 0.434707 8.66723 1.42835 9.29381 1.42835C9.9204 1.42835 10.6525 0.43695 11.2387 0.57153C11.8249 0.706109 12.0719 1.92181 12.6199 2.18424C13.1679 2.44667 14.2661 1.87695 14.7445 2.25826C15.2228 2.63957 14.9039 3.8306 15.2879 4.3106C15.672 4.7906 16.9027 4.73901 17.17 5.29527C17.4372 5.85153 16.631 6.7734 16.768 7.37901C16.9049 7.98461 18.0346 8.45564 18.0346 9.08368Z" stroke="#007F3B" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
-                                            <path d="M9.22597 13.2915L4.92969 8.03622L6.79148 5.27734H11.9479L13.6682 8.03622L9.22597 13.2915Z" fill="#007F3B" stroke="white" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
-                                            <path d="M9.26706 13.2915L7.29297 8.03622L8.14863 5.27734H10.5157L11.304 8.03622L9.26706 13.2915Z" fill="#007F3B" stroke="white" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
-                                            <path d="M5.11328 7.99609H12.1338" stroke="white" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
-                                        </g>
-                                        <defs>
-                                            <clipPath id="clip0_4164_3951">
-                                                <rect width="18.5764" height="24" fill="white" />
-                                            </clipPath>
-                                        </defs>
-                                    </svg> <span class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-padding-right-2 nhsuk-u-padding-left-1">Certificate:</span>
-                                    <span class="nhsuk-u-font-size-16">awarded [@certificateAwardedText]</span>
+                                    <div class="nhsuk-u-padding-bottom-5 nhsuk-u-padding-top-4 nhsuk-u-font-size-16">
+                                        <svg xmlns="http://www.w3.org/2000/svg" width="19" height="24" viewBox="0 0 19 24" fill="none">
+                                            <g clip-path="url(#clip0_4164_3951)">
+                                                <path d="M13.3598 18.9737V23.1883C13.3598 23.4148 12.7512 23.5225 12.4233 23.3543L9.57333 21.8784C9.35548 21.7662 8.97144 21.7685 8.76034 21.8851L6.18212 23.3139C5.86096 23.4911 5.23438 23.3879 5.23438 23.1546V17.6055" stroke="#007F3B" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
+                                                <path d="M18.0346 9.08368C18.0346 9.70947 16.9027 10.2007 16.768 10.7884C16.6332 11.376 17.435 12.327 17.17 12.8721C16.9049 13.4171 15.6675 13.379 15.2857 13.8568C14.9039 14.3345 15.2228 15.5255 14.7422 15.9091C14.2616 16.2927 13.1746 15.714 12.6176 15.9831C12.0607 16.2523 11.8428 17.459 11.2365 17.5958C10.6301 17.7327 9.91816 16.739 9.29157 16.739C8.66498 16.739 7.93284 17.7304 7.34668 17.5958C6.76051 17.4613 6.51347 16.2456 5.96549 15.9831C5.4175 15.7207 4.31929 16.2904 3.84093 15.9091C3.36257 15.5278 3.68147 14.3368 3.29744 13.8568C2.9134 13.3768 1.68268 13.4284 1.41543 12.8721C1.14817 12.3158 1.95443 11.394 1.81743 10.7884C1.68044 10.1827 0.550781 9.71172 0.550781 9.08368C0.550781 8.45564 1.68268 7.96667 1.81743 7.37901C1.95218 6.79134 1.15042 5.84032 1.41543 5.29527C1.68044 4.75022 2.91789 4.78835 3.29968 4.3106C3.68147 3.83284 3.36257 2.64181 3.84317 2.25826C4.32378 1.87471 5.41077 2.4534 5.96773 2.18424C6.5247 1.91508 6.74255 0.708352 7.34892 0.57153C7.9553 0.434707 8.66723 1.42835 9.29381 1.42835C9.9204 1.42835 10.6525 0.43695 11.2387 0.57153C11.8249 0.706109 12.0719 1.92181 12.6199 2.18424C13.1679 2.44667 14.2661 1.87695 14.7445 2.25826C15.2228 2.63957 14.9039 3.8306 15.2879 4.3106C15.672 4.7906 16.9027 4.73901 17.17 5.29527C17.4372 5.85153 16.631 6.7734 16.768 7.37901C16.9049 7.98461 18.0346 8.45564 18.0346 9.08368Z" fill="#007F3B" />
+                                                <path d="M18.0346 9.08368C18.0346 9.70947 16.9027 10.2007 16.768 10.7884C16.6332 11.376 17.435 12.327 17.17 12.8721C16.9049 13.4171 15.6675 13.379 15.2857 13.8568C14.9039 14.3345 15.2228 15.5255 14.7422 15.9091C14.2616 16.2927 13.1746 15.714 12.6176 15.9831C12.0607 16.2523 11.8428 17.459 11.2365 17.5958C10.6301 17.7327 9.91816 16.739 9.29157 16.739C8.66498 16.739 7.93284 17.7304 7.34668 17.5958C6.76051 17.4612 6.51347 16.2455 5.96549 15.9831C5.4175 15.7207 4.31929 16.2904 3.84093 15.9091C3.36257 15.5278 3.68147 14.3368 3.29744 13.8568C2.9134 13.3768 1.68268 13.4284 1.41543 12.8721C1.14817 12.3158 1.95443 11.394 1.81743 10.7884C1.68044 10.1827 0.550781 9.71172 0.550781 9.08368C0.550781 8.45564 1.68268 7.96667 1.81743 7.37901C1.95218 6.79134 1.15042 5.84032 1.41543 5.29527C1.68044 4.75022 2.91789 4.78835 3.29968 4.3106C3.68147 3.83284 3.36257 2.64181 3.84317 2.25826C4.32378 1.87471 5.41077 2.4534 5.96773 2.18424C6.5247 1.91508 6.74255 0.708352 7.34892 0.57153C7.9553 0.434707 8.66723 1.42835 9.29381 1.42835C9.9204 1.42835 10.6525 0.43695 11.2387 0.57153C11.8249 0.706109 12.0719 1.92181 12.6199 2.18424C13.1679 2.44667 14.2661 1.87695 14.7445 2.25826C15.2228 2.63957 14.9039 3.8306 15.2879 4.3106C15.672 4.7906 16.9027 4.73901 17.17 5.29527C17.4372 5.85153 16.631 6.7734 16.768 7.37901C16.9049 7.98461 18.0346 8.45564 18.0346 9.08368Z" stroke="#007F3B" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
+                                                <path d="M9.22597 13.2915L4.92969 8.03622L6.79148 5.27734H11.9479L13.6682 8.03622L9.22597 13.2915Z" fill="#007F3B" stroke="white" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
+                                                <path d="M9.26706 13.2915L7.29297 8.03622L8.14863 5.27734H10.5157L11.304 8.03622L9.26706 13.2915Z" fill="#007F3B" stroke="white" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
+                                                <path d="M5.11328 7.99609H12.1338" stroke="white" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
+                                            </g>
+                                            <defs>
+                                                <clipPath id="clip0_4164_3951">
+                                                    <rect width="18.5764" height="24" fill="white" />
+                                                </clipPath>
+                                            </defs>
+                                        </svg> <span class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-padding-right-2 nhsuk-u-padding-left-1">Certificate:</span>
+                                        <span class="nhsuk-u-font-size-16">awarded [@certificateAwardedText]</span>
 
-                                </div>
+                                    </div>
 
                                 }
                                 else
                                 {
-                                <div class="nhs-item-row nhsuk-u-padding-bottom-5 nhsuk-u-padding-top-4">
-                                    @if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
+                                    <div class="nhs-item-row nhsuk-u-padding-bottom-5 nhsuk-u-padding-top-4">
+                                        @if (ViewActivityHelper.GetResourceTypeDesc(activity.ResourceType) == "Course")
                                         {
-                                    <div class="nhsuk-u-padding-top-4 nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-secondary-text-color" id="progressText"> @activity.CompletedActivities of @activity.TotalActivities activities completed</div>
+                                            <div class="nhsuk-u-padding-top-4 nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-secondary-text-color" id="progressText"> @activity.CompletedActivities of @activity.TotalActivities activities completed</div>
                                         }
                                         else
                                         {
-                                    <div>
-                                        <span class="nhsuk-u-visually-hidden">No certificate available</span>
-                                    </div>
+                                            <div>
+                                                <span class="nhsuk-u-visually-hidden">No certificate available</span>
+                                            </div>
                                         }
-                                    @if (activity.CertificateEnabled == true)
+                                        @if (activity.CertificateEnabled == true)
                                         {
-                                    <div class="nhsuk nhsuk-u-font-size-16 nhsuk-u-secondary-text-color">
-                                        Includes a certificate
-                                        <span class="nhsuk-u-padding-left-1">
-                                            <svg xmlns="http://www.w3.org/2000/svg" width="19" height="24" viewBox="0 0 19 24" fill="none">
-                                                <g clip-path="url(#clip0_1298_21764)">
-                                                    <path d="M13.7817 18.9737V23.1883C13.7817 23.4148 13.1731 23.5225 12.8452 23.3543L9.9952 21.8784C9.77736 21.7662 9.39332 21.7685 9.18221 21.8851L6.60399 23.3139C6.28284 23.4911 5.65625 23.3879 5.65625 23.1546V17.6055" stroke="#AEB7BD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
-                                                    <path d="M18.4565 9.08368C18.4565 9.70947 17.3246 10.2007 17.1898 10.7884C17.0551 11.376 17.8568 12.327 17.5918 12.8721C17.3268 13.4171 16.0894 13.379 15.7076 13.8568C15.3258 14.3345 15.6447 15.5255 15.1641 15.9091C14.6835 16.2927 13.5965 15.714 13.0395 15.9831C12.4826 16.2523 12.2647 17.459 11.6583 17.5958C11.052 17.7327 10.34 16.739 9.71344 16.739C9.08685 16.739 8.35471 17.7304 7.76855 17.5958C7.18239 17.4613 6.93535 16.2456 6.38736 15.9831C5.83938 15.7207 4.74117 16.2904 4.2628 15.9091C3.78444 15.5278 4.10335 14.3368 3.71931 13.8568C3.33527 13.3768 2.10456 13.4284 1.8373 12.8721C1.57005 12.3158 2.3763 11.394 2.23931 10.7884C2.10231 10.1827 0.972656 9.71172 0.972656 9.08368C0.972656 8.45564 2.10456 7.96667 2.23931 7.37901C2.37406 6.79134 1.57229 5.84032 1.8373 5.29527C2.10231 4.75022 3.33977 4.78835 3.72156 4.3106C4.10335 3.83284 3.78444 2.64181 4.26505 2.25826C4.74566 1.87471 5.83264 2.4534 6.38961 2.18424C6.94658 1.91508 7.16442 0.708352 7.7708 0.57153C8.37717 0.434707 9.0891 1.42835 9.71569 1.42835C10.3423 1.42835 11.0744 0.43695 11.6606 0.57153C12.2467 0.706109 12.4938 1.92181 13.0418 2.18424C13.5898 2.44667 14.688 1.87695 15.1663 2.25826C15.6447 2.63957 15.3258 3.8306 15.7098 4.3106C16.0939 4.7906 17.3246 4.73901 17.5918 5.29527C17.8591 5.85153 17.0528 6.7734 17.1898 7.37901C17.3268 7.98461 18.4565 8.45564 18.4565 9.08368Z" fill="#F2F8FD" />
-                                                    <path d="M18.4565 9.08368C18.4565 9.70947 17.3246 10.2007 17.1898 10.7884C17.0551 11.376 17.8568 12.327 17.5918 12.8721C17.3268 13.4171 16.0894 13.379 15.7076 13.8568C15.3258 14.3345 15.6447 15.5255 15.1641 15.9091C14.6835 16.2927 13.5965 15.714 13.0395 15.9831C12.4826 16.2523 12.2647 17.459 11.6583 17.5958C11.052 17.7327 10.34 16.739 9.71344 16.739C9.08686 16.739 8.35471 17.7304 7.76855 17.5958C7.18239 17.4612 6.93535 16.2455 6.38736 15.9831C5.83938 15.7207 4.74117 16.2904 4.2628 15.9091C3.78444 15.5278 4.10335 14.3368 3.71931 13.8568C3.33527 13.3768 2.10456 13.4284 1.8373 12.8721C1.57005 12.3158 2.3763 11.394 2.23931 10.7884C2.10231 10.1827 0.972656 9.71172 0.972656 9.08368C0.972656 8.45564 2.10456 7.96667 2.23931 7.37901C2.37406 6.79134 1.57229 5.84032 1.8373 5.29527C2.10231 4.75022 3.33977 4.78835 3.72156 4.3106C4.10335 3.83284 3.78444 2.64181 4.26505 2.25826C4.74566 1.87471 5.83264 2.4534 6.38961 2.18424C6.94658 1.91508 7.16442 0.708352 7.7708 0.57153C8.37717 0.434707 9.0891 1.42835 9.71569 1.42835C10.3423 1.42835 11.0744 0.43695 11.6606 0.57153C12.2467 0.706109 12.4938 1.92181 13.0418 2.18424C13.5898 2.44667 14.688 1.87695 15.1663 2.25826C15.6447 2.63957 15.3258 3.8306 15.7098 4.3106C16.0939 4.7906 17.3246 4.73901 17.5918 5.29527C17.8591 5.85153 17.0528 6.7734 17.1898 7.37901C17.3268 7.98461 18.4565 8.45564 18.4565 9.08368Z" stroke="#AEB7BD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
-                                                    <path d="M9.64784 13.2915L5.35156 8.03622L7.21336 5.27734H12.3698L14.0901 8.03622L9.64784 13.2915Z" fill="#F2F8FD" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
-                                                    <path d="M9.68893 13.2915L7.71484 8.03622L8.57051 5.27734H10.9376L11.7259 8.03622L9.68893 13.2915Z" fill="#F2F8FD" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
-                                                    <path d="M5.53516 7.99609H12.5556" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
-                                                </g>
-                                                <defs>
-                                                    <clipPath id="clip0_1298_21764">
-                                                        <rect width="18.5764" height="24" fill="white" transform="translate(0.421875)" />
-                                                    </clipPath>
-                                                </defs>
-                                            </svg>
-                                        </span>
-                                    </div>
+                                            <div class="nhsuk nhsuk-u-font-size-16 nhsuk-u-secondary-text-color">
+                                                Includes a certificate
+                                                <span class="nhsuk-u-padding-left-1">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" width="19" height="24" viewBox="0 0 19 24" fill="none">
+                                                        <g clip-path="url(#clip0_1298_21764)">
+                                                            <path d="M13.7817 18.9737V23.1883C13.7817 23.4148 13.1731 23.5225 12.8452 23.3543L9.9952 21.8784C9.77736 21.7662 9.39332 21.7685 9.18221 21.8851L6.60399 23.3139C6.28284 23.4911 5.65625 23.3879 5.65625 23.1546V17.6055" stroke="#AEB7BD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
+                                                            <path d="M18.4565 9.08368C18.4565 9.70947 17.3246 10.2007 17.1898 10.7884C17.0551 11.376 17.8568 12.327 17.5918 12.8721C17.3268 13.4171 16.0894 13.379 15.7076 13.8568C15.3258 14.3345 15.6447 15.5255 15.1641 15.9091C14.6835 16.2927 13.5965 15.714 13.0395 15.9831C12.4826 16.2523 12.2647 17.459 11.6583 17.5958C11.052 17.7327 10.34 16.739 9.71344 16.739C9.08685 16.739 8.35471 17.7304 7.76855 17.5958C7.18239 17.4613 6.93535 16.2456 6.38736 15.9831C5.83938 15.7207 4.74117 16.2904 4.2628 15.9091C3.78444 15.5278 4.10335 14.3368 3.71931 13.8568C3.33527 13.3768 2.10456 13.4284 1.8373 12.8721C1.57005 12.3158 2.3763 11.394 2.23931 10.7884C2.10231 10.1827 0.972656 9.71172 0.972656 9.08368C0.972656 8.45564 2.10456 7.96667 2.23931 7.37901C2.37406 6.79134 1.57229 5.84032 1.8373 5.29527C2.10231 4.75022 3.33977 4.78835 3.72156 4.3106C4.10335 3.83284 3.78444 2.64181 4.26505 2.25826C4.74566 1.87471 5.83264 2.4534 6.38961 2.18424C6.94658 1.91508 7.16442 0.708352 7.7708 0.57153C8.37717 0.434707 9.0891 1.42835 9.71569 1.42835C10.3423 1.42835 11.0744 0.43695 11.6606 0.57153C12.2467 0.706109 12.4938 1.92181 13.0418 2.18424C13.5898 2.44667 14.688 1.87695 15.1663 2.25826C15.6447 2.63957 15.3258 3.8306 15.7098 4.3106C16.0939 4.7906 17.3246 4.73901 17.5918 5.29527C17.8591 5.85153 17.0528 6.7734 17.1898 7.37901C17.3268 7.98461 18.4565 8.45564 18.4565 9.08368Z" fill="#F2F8FD" />
+                                                            <path d="M18.4565 9.08368C18.4565 9.70947 17.3246 10.2007 17.1898 10.7884C17.0551 11.376 17.8568 12.327 17.5918 12.8721C17.3268 13.4171 16.0894 13.379 15.7076 13.8568C15.3258 14.3345 15.6447 15.5255 15.1641 15.9091C14.6835 16.2927 13.5965 15.714 13.0395 15.9831C12.4826 16.2523 12.2647 17.459 11.6583 17.5958C11.052 17.7327 10.34 16.739 9.71344 16.739C9.08686 16.739 8.35471 17.7304 7.76855 17.5958C7.18239 17.4612 6.93535 16.2455 6.38736 15.9831C5.83938 15.7207 4.74117 16.2904 4.2628 15.9091C3.78444 15.5278 4.10335 14.3368 3.71931 13.8568C3.33527 13.3768 2.10456 13.4284 1.8373 12.8721C1.57005 12.3158 2.3763 11.394 2.23931 10.7884C2.10231 10.1827 0.972656 9.71172 0.972656 9.08368C0.972656 8.45564 2.10456 7.96667 2.23931 7.37901C2.37406 6.79134 1.57229 5.84032 1.8373 5.29527C2.10231 4.75022 3.33977 4.78835 3.72156 4.3106C4.10335 3.83284 3.78444 2.64181 4.26505 2.25826C4.74566 1.87471 5.83264 2.4534 6.38961 2.18424C6.94658 1.91508 7.16442 0.708352 7.7708 0.57153C8.37717 0.434707 9.0891 1.42835 9.71569 1.42835C10.3423 1.42835 11.0744 0.43695 11.6606 0.57153C12.2467 0.706109 12.4938 1.92181 13.0418 2.18424C13.5898 2.44667 14.688 1.87695 15.1663 2.25826C15.6447 2.63957 15.3258 3.8306 15.7098 4.3106C16.0939 4.7906 17.3246 4.73901 17.5918 5.29527C17.8591 5.85153 17.0528 6.7734 17.1898 7.37901C17.3268 7.98461 18.4565 8.45564 18.4565 9.08368Z" stroke="#AEB7BD" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round" />
+                                                            <path d="M9.64784 13.2915L5.35156 8.03622L7.21336 5.27734H12.3698L14.0901 8.03622L9.64784 13.2915Z" fill="#F2F8FD" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
+                                                            <path d="M9.68893 13.2915L7.71484 8.03622L8.57051 5.27734H10.9376L11.7259 8.03622L9.68893 13.2915Z" fill="#F2F8FD" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
+                                                            <path d="M5.53516 7.99609H12.5556" stroke="#AEB7BD" stroke-width="0.9" stroke-linecap="round" stroke-linejoin="round" />
+                                                        </g>
+                                                        <defs>
+                                                            <clipPath id="clip0_1298_21764">
+                                                                <rect width="18.5764" height="24" fill="white" transform="translate(0.421875)" />
+                                                            </clipPath>
+                                                        </defs>
+                                                    </svg>
+                                                </span>
+                                            </div>
                                         }
-                                </div>
+                                    </div>
                                 }
                             </div>
                             <div class="nhsuk-u-padding-bottom-5">
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/Configuration/MoodleBridgeConfig.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Models/Configuration/MoodleBridgeConfig.cs
new file mode 100644
index 000000000..4798fabe8
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/Configuration/MoodleBridgeConfig.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LearningHub.Nhs.OpenApi.Models.Configuration
+{
+    /// <summary>
+    /// The Moodle Bridge Settings.
+    /// </summary>
+    public class MoodleBridgeAPIConfig
+    {
+        /// <summary>
+        /// Gets or sets the base url for the Moodle service.
+        /// </summary>
+        public string BaseUrl { get; set; } = null!;
+
+        /// <summary>
+        /// Gets or sets the token.
+        /// </summary>
+        public string Token { get; set; } = null!;
+    }
+}
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 829bba059..f93a18aa5 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -17,8 +17,12 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.Search.Documents" Version="11.7.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="ServiceModels\MoodleBridge\" />
+	</ItemGroup>
+
 </Project>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj
index cbac27a64..043795e81 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj
@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
 	</ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj
index 6a727dc60..29d8422f7 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj
@@ -24,7 +24,7 @@
 		<PackageReference Include="AutoMapper" Version="10.1.1" />
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/Hierarchy/CatalogueNodeVersionRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/Hierarchy/CatalogueNodeVersionRepository.cs
index 3367b371f..32932e648 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/Hierarchy/CatalogueNodeVersionRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/Hierarchy/CatalogueNodeVersionRepository.cs
@@ -226,12 +226,14 @@ public async Task AddCategoryToCatalogueAsync(int userId, CatalogueViewModel vm)
         {
             try
             {
+                var (instanceName, categoryId) = vm.SelectedCategoryId.Split(':') is var p && p.Length == 2 ? (p[0], p[1]) : (null, null);
                 var param0 = new SqlParameter("@p0", SqlDbType.Int) { Value = userId };
                 var param1 = new SqlParameter("@p1", SqlDbType.Int) { Value = vm.CatalogueNodeVersionId };
-                var param2 = new SqlParameter("@p2", SqlDbType.Int) { Value = vm.SelectedCategoryId };
-                var param3 = new SqlParameter("@p3", SqlDbType.Int) { Value = TimezoneOffsetManager.UserTimezoneOffset ?? (object)DBNull.Value };
+                var param2 = new SqlParameter("@p2", SqlDbType.Int) { Value = categoryId };
+                var param3 = new SqlParameter("@p3", SqlDbType.VarChar) { Value = instanceName };
+                var param4 = new SqlParameter("@p4", SqlDbType.Int) { Value = TimezoneOffsetManager.UserTimezoneOffset ?? (object)DBNull.Value };
 
-                await DbContext.Database.ExecuteSqlRawAsync("hierarchy.CatalogueNodeVersionCategoryCreate @p0, @p1, @p2, @p3", param0, param1, param2, param3);
+                await DbContext.Database.ExecuteSqlRawAsync("hierarchy.CatalogueNodeVersionCategoryCreate @p0, @p1, @p2, @p3, @p4", param0, param1, param2, param3, param4);
             }
             catch (Exception ex)
             {
@@ -249,9 +251,10 @@ public async Task RemoveCategoryFromCatalogueAsync(int userId, CatalogueViewMode
         {
             try
             {
+                var (instanceName, categoryId) = vm.SelectedCategoryId.Split(':') is var p && p.Length == 2 ? (p[0], p[1]) : (null, null);
                 var param0 = new SqlParameter("@p0", SqlDbType.Int) { Value = userId };
                 var param1 = new SqlParameter("@p1", SqlDbType.Int) { Value = vm.CatalogueNodeVersionId };
-                var param2 = new SqlParameter("@p2", SqlDbType.Int) { Value = vm.SelectedCategoryId };
+                var param2 = new SqlParameter("@p2", SqlDbType.Int) { Value = categoryId };
                 var param3 = new SqlParameter("@p3", SqlDbType.Int) { Value = TimezoneOffsetManager.UserTimezoneOffset ?? (object)DBNull.Value };
 
                 await DbContext.Database.ExecuteSqlRawAsync("hierarchy.RemoveCatalogueCategory @p0, @p1, @p2, @p3", param0, param1, param2, param3);
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/HttpClients/IMoodleBridgeHttpClient.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/HttpClients/IMoodleBridgeHttpClient.cs
new file mode 100644
index 000000000..129d3eec3
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/HttpClients/IMoodleBridgeHttpClient.cs
@@ -0,0 +1,25 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace LearningHub.Nhs.OpenApi.Services.Interface.HttpClients
+{
+    /// <summary>
+    /// The Moodle Http Client interface.
+    /// </summary>
+    public interface IMoodleBridgeHttpClient
+    {
+        /// <summary>
+        /// The get cient async.
+        /// </summary>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<HttpClient> GetClient();
+
+        /// <summary>
+        /// GETs data from Databricks API.
+        /// </summary>
+        /// <param name="requestUrl">The URL to make a get call to.</param>
+        /// <param name="authHeader">Optional authorization header.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<HttpResponseMessage> GetData(string requestUrl, string? authHeader);
+    }
+}
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 175ac7fb3..4f1227545 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
@@ -17,7 +17,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ICategoryService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ICategoryService.cs
index 5c4a994a4..2ac311640 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ICategoryService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ICategoryService.cs
@@ -14,6 +14,6 @@ public interface ICategoryService
         /// </summary>
         /// <param name="nodeVersionId">node version id.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<int> GetByCatalogueVersionIdAsync(int nodeVersionId);
+        Task<CatalogueNodeVersionCategory> GetByCatalogueVersionIdAsync(int nodeVersionId);
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IDashboardService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IDashboardService.cs
index 7897acf90..ff04ae056 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IDashboardService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IDashboardService.cs
@@ -21,13 +21,11 @@ public interface IDashboardService
         /// <summary>
         /// Get My in progress courses and Elearning.
         /// </summary>
-        /// <param name="dashboardTrayLearningResourceType">The dashboardTrayLearningResource type.</param>
-        /// <param name="dashboardType">The dashboard type.</param>
-        /// <param name="pageNumber">The page Number.</param>
+        /// <param name="requestModel">The requestModel.</param>
         /// <param name="userId">The userId.</param>
         /// <param name="resourceType">The resourceType.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning(string dashboardTrayLearningResourceType, string dashboardType, int pageNumber, int userId, string resourceType);
+        Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning(GetMyCoursesAndElearningRequestModel requestModel, int userId, string resourceType);
 
         /// <summary>
         /// Gets the user in progrss my leraning activities..
@@ -35,8 +33,9 @@ public interface IDashboardService
         /// <param name="dashboardTrayLearningResourceType">The dashboardTrayLearningResourceType.</param>
         /// <param name="pageNumber">The pageNumber.</param>
         /// <param name="userId">The user id.</param>
+        /// <param name="email">The email.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearningAsync(string dashboardTrayLearningResourceType, int pageNumber, int userId);
+        Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearningAsync(string dashboardTrayLearningResourceType, int pageNumber, int userId, string email);
 
         /// <summary>
         /// Gets the resource certificate details.
@@ -45,7 +44,7 @@ public interface IDashboardService
         /// <param name="userId">The user id.</param>
         /// <param name="dashboardTrayLearningResourceType">The resourceType.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetailsAsync(string dashboardTrayLearningResourceType, int pageNumber, int userId);
+        Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetailsAsync(string dashboardTrayLearningResourceType, int pageNumber, int userId, string email);
 
         /// <summary>
         /// GetResources.
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IFindwiseApiFacade.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IFindwiseApiFacade.cs
deleted file mode 100644
index dddf22fc1..000000000
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IFindwiseApiFacade.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace LearningHub.Nhs.OpenApi.Services.Interface.Services
-{
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-    using LearningHub.Nhs.Models.Search;
-
-    /// <summary>
-    /// The IFindwiseApiFacade.
-    /// </summary>
-    public interface IFindwiseApiFacade
-    {
-        /// <summary>
-        /// Modifies the information Findwise has for the catalogues provided.
-        /// Documents not in Findwise will be added.
-        /// Documents that already exist in Findwise will be replaced.
-        /// </summary>
-        /// <param name="catalogues">The catalogues to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        Task AddOrReplaceAsync(List<SearchCatalogueRequestModel> catalogues);
-
-        /// <summary>
-        /// Modifies the information Findwise has for the resources provided.
-        /// Documents not in Findwise will be added.
-        /// Documents that already exist in Findwise will be replaced.
-        /// </summary>
-        /// <param name="resources">The resources to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        Task AddOrReplaceAsync(List<SearchResourceRequestModel> resources);
-
-        /// <summary>
-        /// Removes the documents from Findwise.
-        /// </summary>
-        /// <param name="resources">The resources to remove from Findwise.</param>
-        /// <returns>The task.</returns>
-        Task RemoveAsync(List<SearchResourceRequestModel> resources);
-    }
-}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IMoodleBridgeApiService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IMoodleBridgeApiService.cs
new file mode 100644
index 000000000..3bd55103b
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IMoodleBridgeApiService.cs
@@ -0,0 +1,90 @@
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using LearningHub.Nhs.Models.Moodle;
+using LearningHub.Nhs.Models.Moodle.API;
+using LearningHub.Nhs.Models.MyLearning;
+using LearningHub.Nhs.Models.User;
+
+namespace LearningHub.Nhs.OpenApi.Services.Interface.Services
+{
+    /// <summary>
+    /// IMoodleBridgeApiService.
+    /// </summary>
+    public interface IMoodleBridgeApiService
+    {
+        /// <summary>
+        /// GetUserInstancesByEmailAsync.
+        /// </summary>
+        /// <param name="email">The current LH User email.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<MoodleInstanceUserIdsViewModel> GetUserInstancesByEmail(string email);
+
+        /// <summary>
+        /// UpdateEmail.
+        /// </summary>
+        /// <param name="updateEmailaddressViewModel">TheupdateEmailaddressViewModel.</param>
+        /// <returns></returns>
+        Task<MoodleUpdateEmailResponseModel> UpdateEmail(UpdateEmailaddressViewModel updateEmailaddressViewModel);
+
+        /// <summary>
+        /// GetRecentEnrolledCoursesAsync.
+        /// </summary>
+        /// <param name="moodleUserInstanceUserIds">The moodleUserInstanceUserIds.</param>
+        /// <param name="requestModel">The requestModel.</param>
+        /// <param name="month">The month.</param>
+        /// <returns></returns>
+        Task<MoodleCompletionsApiResponseModel> GetRecentEnrolledCoursesAsync(MoodleInstanceUserIdsViewModel moodleUserInstanceUserIds, MyLearningRequestModel requestModel, int? month = null);
+
+        /// <summary>
+        /// GetAllMoodleCategoriesAsync.
+        /// </summary>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<List<CategoryResult>> GetAllMoodleCategoriesAsync();
+
+        /// <summary>
+        /// GetEnrolledCoursesAsync.
+        /// </summary>
+        /// <param name="moodleUserInstanceUserIds">Moodle Instances user id.</param>
+        /// <param name="requestModel">MyLearningRequestModel requestModel.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<MoodleCompletionsApiResponseModel> GetEnrolledCoursesHistoryAsync(MoodleInstanceUserIdsViewModel moodleUserInstanceUserIds, MyLearningRequestModel requestModel);
+
+        /// <summary>
+        /// GetInProgressEnrolledCoursesAsync.
+        /// </summary>
+        /// <param name="email">The email.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<MoodleCompletionsApiResponseModel> GetInProgressEnrolledCoursesAsync(string email);
+
+        /// <summary>
+        /// GetUserLearningHistory.
+        /// </summary>
+        /// <param name="email">user email.</param>
+        /// <param name="filterText">The filterText.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<MoodleCertificateResponseModel> GetUserCertificateAsync(string email, string filterText = "");
+
+        /// <summary>
+        /// GetUserCertificateFromMoodleInstancesAsync.
+        /// </summary>
+        /// <param name="moodleUserInstanceUserIds">Moodle Instances user id.</param>
+        /// <param name="filterText">filterText.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<MoodleCertificateResponseModel> GetUserCertificateFromMoodleInstancesAsync(MoodleInstanceUserIdsViewModel moodleUserInstanceUserIds, string filterText = "");
+
+        /// <summary>
+        /// GetCoursesByCategoryIdAsync.
+        /// </summary>
+        /// <param name="categoryId">The categoryId.</param>
+        /// <returns></returns>
+        Task<MoodleCourseResultsResponseModel> GetCoursesByCategoryIdAsync(string categoryId);
+
+        /// <summary>
+        /// GetSubCategoryByCategoryIdAsync.
+        /// </summary>
+        /// <param name="categoryId">The categoryId.</param>
+        /// <returns></returns>
+        Task<List<SubCategoryResult>> GetSubCategoryByCategoryIdAsync(string categoryId);
+    }
+}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IMyLearningService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IMyLearningService.cs
index 04a68d86f..aabdc0d99 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IMyLearningService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IMyLearningService.cs
@@ -26,7 +26,7 @@ public interface IMyLearningService
         /// /// <param name="userId">The user id.</param>
         /// <param name="requestModel">The request model.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivitiesAsync(int userId, MyLearningRequestModel requestModel);
+        Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivitiesAsync(int userId, MyLearningApiRequestViewModel requestModel);
 
         /// <summary>
         /// Gets history of users my leraning activities.
@@ -34,7 +34,7 @@ public interface IMyLearningService
         /// /// <param name="userId">The user id.</param>
         /// <param name="requestModel">The request model.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistoryAsync(int userId, MyLearningRequestModel requestModel);
+        Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistoryAsync(int userId, MyLearningApiRequestViewModel requestModel);
 
         /// <summary>
         /// Gets the played segment data for the progress modal in My Learning screen.
@@ -69,6 +69,6 @@ public interface IMyLearningService
         /// <param name="userId">The user id.</param>
         /// <param name="requestModel">The request model</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetails(int userId, MyLearningRequestModel requestModel);
+        Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetails(int userId, MyLearningApiRequestViewModel requestModel);
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Helpers/MoodleInstanceUsersHelper.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Helpers/MoodleInstanceUsersHelper.cs
new file mode 100644
index 000000000..de3272ec0
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Helpers/MoodleInstanceUsersHelper.cs
@@ -0,0 +1,47 @@
+namespace LearningHub.Nhs.OpenApi.Services.Helpers
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using LearningHub.Nhs.Models.Enums;
+    using LearningHub.Nhs.Models.Moodle;
+    using LearningHub.Nhs.Models.Resource;
+    using LearningHub.Nhs.Models.Resource.Blocks;
+
+    /// <summary>
+    /// A class containing helper functions for building moodle user instances.
+    /// </summary>
+    public class MoodleInstanceUsersHelper
+    {
+        /// <summary>
+        /// BuildMoodleUserInstances.
+        /// </summary>
+        /// <param name="mappings"></param>
+        /// <returns></returns>
+        public static MoodleInstanceUserIdsViewModel BuildUserIdsByInstance(
+         IEnumerable<MoodleUserMapping> mappings)
+        {
+            var dict = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var m in mappings)
+            {
+                if (m?.User is null) continue;
+                if (m.User.Id <= 0) continue;
+
+                var key = string.IsNullOrWhiteSpace(m.Instance)
+                    ? $"instance_{m.User.Id}"
+                    : m.Instance!;
+
+                if (!dict.ContainsKey(key))
+                {
+                    dict[key] = m.User.Id;
+                }
+            }
+
+            return new MoodleInstanceUserIdsViewModel
+            {
+                MoodleInstanceUserIds = dict
+            };
+        }
+    }
+}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/HttpClients/MoodleBridgeHttpClient.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/HttpClients/MoodleBridgeHttpClient.cs
new file mode 100644
index 000000000..e7812294d
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/HttpClients/MoodleBridgeHttpClient.cs
@@ -0,0 +1,97 @@
+using IdentityModel.Client;
+using LearningHub.Nhs.Models.Entities.Reporting;
+using LearningHub.Nhs.OpenApi.Models.Configuration;
+using LearningHub.Nhs.OpenApi.Services.Interface.HttpClients;
+using Microsoft.Extensions.Options;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LearningHub.Nhs.OpenApi.Services.HttpClients
+{
+    /// <summary>
+    /// The Moodle Http Client.
+    /// </summary>
+    public class MoodleBridgeHttpClient : IMoodleBridgeHttpClient, IDisposable
+    {
+        private readonly MoodleBridgeAPIConfig moodleBridgeApiConfig;
+        private readonly HttpClient httpClient = new();
+
+        private bool initialised = false;
+        private string moodleBridgeApiUrl;
+        private string moodleBridgeApiToken;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MoodleBridgeHttpClient"/> class.
+        /// </summary>
+        /// <param name="httpClient">httpClient.</param>
+        /// <param name="moodleBridgeApiConfig">config.</param>
+        public MoodleBridgeHttpClient(HttpClient httpClient, IOptions<MoodleBridgeAPIConfig> moodleBridgeApiConfig)
+        {
+            this.moodleBridgeApiConfig = moodleBridgeApiConfig.Value;
+            this.httpClient = httpClient;
+
+            this.moodleBridgeApiUrl = this.moodleBridgeApiConfig.BaseUrl;
+            this.moodleBridgeApiToken = this.moodleBridgeApiConfig.Token;
+        }
+
+        /// <summary>
+        /// The Get Client method.
+        /// </summary>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<HttpClient> GetClient()
+        {
+            this.Initialise(this.moodleBridgeApiUrl);
+            return this.httpClient;
+        }
+
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            this.Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// The dispoase.
+        /// </summary>
+        /// <param name="disposing">disposing.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.httpClient.Dispose();
+            }
+        }
+
+        private void Initialise(string httpClientUrl)
+        {
+            if (this.initialised == false)
+            {
+                this.httpClient.BaseAddress = new Uri(httpClientUrl);
+                this.httpClient.DefaultRequestHeaders.Accept.Clear();
+                this.httpClient.DefaultRequestHeaders.Accept.Add(
+                    new MediaTypeWithQualityHeaderValue("application/json"));
+                this.httpClient.DefaultRequestHeaders.Add("X-API-KEY", moodleBridgeApiToken);
+                this.initialised = true;
+            }
+        }
+
+        /// <inheritdoc/>
+        public async Task<HttpResponseMessage> GetData(string requestUrl, string? authHeader)
+        {
+            if (!string.IsNullOrEmpty(authHeader))
+            {
+                this.httpClient.SetBearerToken(authHeader);
+            }
+
+            var message = await this.httpClient.GetAsync(requestUrl).ConfigureAwait(false);
+            return message;
+        }
+    }
+}
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 36c6d8f5f..64b868475 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -31,7 +31,7 @@
 		<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.14" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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" />
@@ -39,4 +39,8 @@
 		<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Services\Findwise\" />
+	</ItemGroup>
+
 </Project>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs
index 5edfe8cc4..71696c3dd 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs
@@ -51,7 +51,6 @@ public class CatalogueService : ICatalogueService
         private readonly IBookmarkRepository bookmarkRepository;
         private readonly INodeRepository nodeRepository;
         private readonly INodeActivityRepository nodeActivityRepository;
-        private readonly IFindwiseApiFacade findwiseApiFacade;
         private readonly LearningHubConfig learningHubConfig;
         private readonly FindwiseConfig findwiseConfig;
         private readonly INotificationSenderService notificationSenderService;
@@ -78,8 +77,7 @@ public class CatalogueService : ICatalogueService
         /// <param name="emailSenderService"></param>
         /// <param name="bookmarkRepository"></param>
         /// <param name="nodeActivityRepository"></param>
-        /// <param name="findwiseApiFacade"></param>
-        public CatalogueService(ICatalogueRepository catalogueRepository, ICategoryService categoryService, INodeRepository nodeRepository, IUserUserGroupRepository userUserGroupRepository, IMapper mapper, IOptions<FindwiseConfig> findwiseConfig, IOptions<LearningHubConfig> learningHubConfig, ICatalogueNodeVersionRepository catalogueNodeVersionRepository, INodeResourceRepository nodeResourceRepository, IResourceVersionRepository resourceVersionRepository, IRoleUserGroupRepository roleUserGroupRepository, IProviderService providerService, ICatalogueAccessRequestRepository catalogueAccessRequestRepository, IUserRepository userRepository, IUserProfileRepository userProfileRepository, IEmailSenderService emailSenderService, IBookmarkRepository bookmarkRepository,INodeActivityRepository nodeActivityRepository, IFindwiseApiFacade findwiseApiFacade, INotificationSenderService notificationSenderService, ITimezoneOffsetManager timezoneOffsetManager)
+        public CatalogueService(ICatalogueRepository catalogueRepository, ICategoryService categoryService, INodeRepository nodeRepository, IUserUserGroupRepository userUserGroupRepository, IMapper mapper, IOptions<FindwiseConfig> findwiseConfig, IOptions<LearningHubConfig> learningHubConfig, ICatalogueNodeVersionRepository catalogueNodeVersionRepository, INodeResourceRepository nodeResourceRepository, IResourceVersionRepository resourceVersionRepository, IRoleUserGroupRepository roleUserGroupRepository, IProviderService providerService, ICatalogueAccessRequestRepository catalogueAccessRequestRepository, IUserRepository userRepository, IUserProfileRepository userProfileRepository, IEmailSenderService emailSenderService, IBookmarkRepository bookmarkRepository,INodeActivityRepository nodeActivityRepository, INotificationSenderService notificationSenderService, ITimezoneOffsetManager timezoneOffsetManager)
         {
             this.catalogueRepository = catalogueRepository;
             this.categoryService = categoryService;
@@ -97,7 +95,6 @@ public CatalogueService(ICatalogueRepository catalogueRepository, ICategoryServi
             this.emailSenderService = emailSenderService;
             this.bookmarkRepository = bookmarkRepository;
             this.nodeActivityRepository = nodeActivityRepository;
-            this.findwiseApiFacade = findwiseApiFacade;
             this.learningHubConfig = learningHubConfig.Value;
             this.findwiseConfig = findwiseConfig.Value;
             this.timezoneOffsetManager = timezoneOffsetManager;
@@ -229,7 +226,11 @@ public async Task<CatalogueViewModel> GetCatalogueAsync(int id)
             // Used by the admin screen to inform the admin user if they need to add a user group.
             vm.HasUserGroup = this.GetRoleUserGroupsForCatalogue(vm.NodeId).Any();
             vm.Providers = await this.providerService.GetAllAsync();
-            vm.SelectedCategoryId = await this.categoryService.GetByCatalogueVersionIdAsync(vm.CatalogueNodeVersionId);
+            var cataloguNodeeCategories = await this.categoryService.GetByCatalogueVersionIdAsync(vm.CatalogueNodeVersionId);
+            if (cataloguNodeeCategories != null)
+            {
+                vm.SelectedCategoryId = cataloguNodeeCategories.InstanceName + ":" + cataloguNodeeCategories.CategoryId;
+            }
             return vm;
         }
 
@@ -571,24 +572,6 @@ public async Task<LearningHubValidationResult> CreateCatalogueAsync(int userId,
 
             var catalogueNodeVersionId = await this.catalogueNodeVersionRepository.CreateCatalogueAsync(userId, catalogue);
 
-            // Catalogue is in database, push to findwise
-            var cnv = this.catalogueNodeVersionRepository.GetAll()
-                .Include(x => x.NodeVersion).ThenInclude(x => x.Node)
-                .Include(x => x.Keywords)
-                .Include(x => x.CatalogueNodeVersionProvider)
-                .SingleOrDefault(x => x.Id == catalogueNodeVersionId);
-
-            if (cnv != null)
-            {
-                var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
-                if (searchModel.Description.Length > this.findwiseConfig.DescriptionLengthLimit)
-                {
-                    searchModel.Description = searchModel.Description.Substring(0, this.findwiseConfig.DescriptionLengthLimit - 4) + "</p>";
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
-            }
-
             return new LearningHubValidationResult(true)
             {
                 CreatedId = catalogueNodeVersionId,
@@ -805,24 +788,6 @@ public async Task<LearningHubValidationResult> UpdateCatalogueAsync(int userId,
 
             await this.catalogueNodeVersionRepository.UpdateCatalogueAsync(userId, catalogue);
 
-            // Update catalogue in findwise
-            var cnv = this.catalogueNodeVersionRepository.GetAll()
-                .Include(x => x.NodeVersion).ThenInclude(x => x.Node)
-                .Include(x => x.Keywords)
-                .Include(x => x.CatalogueNodeVersionProvider)
-                .SingleOrDefault(x => x.Id == catalogue.CatalogueNodeVersionId);
-
-            if (cnv != null)
-            {
-                var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
-                if (searchModel.Description.Length > this.findwiseConfig.DescriptionLengthLimit)
-                {
-                    searchModel.Description = searchModel.Description.Substring(0, this.findwiseConfig.DescriptionLengthLimit - 4) + "</p>";
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
-            }
-
             return new LearningHubValidationResult(true);
         }
 
@@ -849,24 +814,6 @@ public async Task<LearningHubValidationResult> ShowCatalogueAsync(int userId, in
 
             await this.catalogueNodeVersionRepository.ShowCatalogue(userId, nodeId);
 
-            var cnv = this.catalogueNodeVersionRepository.GetAll()
-                    .Include(x => x.NodeVersion).ThenInclude(x => x.Node)
-                    .Include(x => x.Keywords)
-                    .Include(x => x.CatalogueNodeVersionProvider)
-                    .SingleOrDefault(x => x.NodeVersion.NodeId == nodeId);
-
-            // update findwise
-            if (cnv != null)
-            {
-                var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
-                if (searchModel.Description.Length > this.findwiseConfig.DescriptionLengthLimit)
-                {
-                    searchModel.Description = searchModel.Description.Substring(0, this.findwiseConfig.DescriptionLengthLimit - 4) + "</p>";
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
-            }
-
             return new LearningHubValidationResult(true);
         }
 
@@ -923,23 +870,6 @@ public async Task HideCatalogueAsync(int userId, int nodeId)
 
             node.Hidden = true;
             await this.nodeRepository.UpdateAsync(userId, node);
-
-            // update findwise
-            var cnv = this.catalogueNodeVersionRepository.GetAll()
-                    .Include(x => x.NodeVersion).ThenInclude(x => x.Node)
-                    .Include(x => x.Keywords)
-                    .Include(x => x.CatalogueNodeVersionProvider)
-                    .SingleOrDefault(x => x.NodeVersion.NodeId == nodeId);
-            if (cnv != null)
-            {
-                var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
-                if (searchModel.Description.Length > this.findwiseConfig.DescriptionLengthLimit)
-                {
-                    searchModel.Description = searchModel.Description.Substring(0, this.findwiseConfig.DescriptionLengthLimit - 4) + "</p>";
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
-            }
         }
 
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CategoryService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CategoryService.cs
index e950a1d1f..32b5dfdda 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CategoryService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CategoryService.cs
@@ -36,10 +36,10 @@ public CategoryService(ICategoryRepository categoryRepository, IMapper mapper)
         }
 
         /// <inheritdoc />
-        public async Task<int> GetByCatalogueVersionIdAsync(int nodeVersionId)
+        public async Task<CatalogueNodeVersionCategory> GetByCatalogueVersionIdAsync(int nodeVersionId)
         {
             var category = await categoryRepository.GetCategoryByCatalogueIdAsync(nodeVersionId);
-            return category != null ? category.CategoryId : 0;
+            return category;
         }
     }
 }
\ No newline at end of file
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs
index ad7868baf..95dd23552 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs
@@ -8,17 +8,15 @@
     using AutoMapper;
     using LearningHub.Nhs.Models.Dashboard;
     using LearningHub.Nhs.Models.Enums;
+    using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.Moodle.API;
     using LearningHub.Nhs.Models.MyLearning;
+    using LearningHub.Nhs.Models.Provider;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Activity;
-    using LearningHub.Nhs.Models.Provider;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Hierarchy;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories.Resources;
-    using LearningHub.Nhs.OpenApi.Repositories.Repositories.Activity;
     using LearningHub.Nhs.OpenApi.Services.Interface.Services;
-    using LearningHub.Nhs.Models.Entities.Resource;
-    using System.Diagnostics;
 
     /// <summary>
     /// The DashboardService.
@@ -35,6 +33,11 @@ public class DashboardService : IDashboardService
         /// </summary>
         private readonly IMoodleApiService moodleApiService;
 
+        /// <summary>
+        /// The moodleBridgeApiService.
+        /// </summary>
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
+
         /// <summary>
         /// The resourceActivityRepository.
         /// </summary>
@@ -54,9 +57,10 @@ public class DashboardService : IDashboardService
         /// <param name="ratingService">ratingService.</param>
         /// <param name="providerService">providerService.</param>
         /// <param name="moodleApiService">moodleApiService.</param>
+        /// <param name="moodleBridgeApiService">moodleBridgeApiService.</param>
         /// <param name="resourceActivityRepository">resourceActivityRepository.</param>
         /// <param name="resourceRepository">resourceRepository.</param>
-        public DashboardService(IMapper mapper, IResourceVersionRepository resourceVersionRepository, ICatalogueNodeVersionRepository catalogueNodeVersionRepository, IRatingService ratingService, IProviderService providerService, IMoodleApiService moodleApiService, IResourceActivityRepository resourceActivityRepository, IResourceRepository resourceRepository)
+        public DashboardService(IMapper mapper, IResourceVersionRepository resourceVersionRepository, ICatalogueNodeVersionRepository catalogueNodeVersionRepository, IRatingService ratingService, IProviderService providerService, IMoodleApiService moodleApiService, IMoodleBridgeApiService moodleBridgeApiService, IResourceActivityRepository resourceActivityRepository, IResourceRepository resourceRepository)
         {
             this.mapper = mapper;
             this.resourceVersionRepository = resourceVersionRepository;
@@ -66,6 +70,7 @@ public DashboardService(IMapper mapper, IResourceVersionRepository resourceVersi
             this.moodleApiService = moodleApiService;
             this.resourceActivityRepository = resourceActivityRepository;
             this.resourceRepository = resourceRepository;
+            this.moodleBridgeApiService = moodleBridgeApiService;
         }
 
         /// <summary>
@@ -126,28 +131,28 @@ public async Task<DashboardMyLearningResponseViewModel> GetMyAccessLearnings(str
         /// <param name="userId">The userId.</param>
         /// <param name="resourceType">The resourceType.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        public async Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning(string dashboardTrayLearningResourceType, string dashboardType, int pageNumber, int userId, string resourceType)
+        public async Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning(GetMyCoursesAndElearningRequestModel requestModel, int userId, string resourceType)
         {
             MyLearningActivitiesDetailedViewModel myInProgressActivities = new();
             MyLearningCertificatesDetailedViewModel certificates = new();
             List<DashboardResourceDto> resources = new();
             int resourceCount = 0;
-            if (dashboardType == "my-in-progress")
+            if (requestModel.DashboardType == "my-in-progress")
             {
-                myInProgressActivities = await this.GetMyInprogressLearningAsync(dashboardTrayLearningResourceType, pageNumber, userId);
+                myInProgressActivities = await this.GetMyInprogressLearningAsync(requestModel.DashboardTrayLearningResourceType, requestModel.PageNumber, userId, requestModel.Email);
             }
-            else if (dashboardType == "my-certificates")
+            else if (requestModel.DashboardType == "my-certificates")
             {
-                certificates = await this.GetUserCertificateDetailsAsync(dashboardTrayLearningResourceType, pageNumber, userId);
+                certificates = await this.GetUserCertificateDetailsAsync(requestModel.DashboardTrayLearningResourceType, requestModel.PageNumber, userId, requestModel.Email);
             }
             else
             {
-                var result = resourceVersionRepository.GetResources(dashboardType, pageNumber, userId);
+                var result = resourceVersionRepository.GetResources(requestModel.DashboardType, requestModel.PageNumber, userId);
                 resourceCount = result.resourceCount;
                 resources = result.resources ?? new List<DashboardResourceDto>();
             }
 
-            var cataloguesResponse = dashboardType.ToLower() == "my-catalogues" ? catalogueNodeVersionRepository.GetCatalogues(dashboardType, pageNumber, userId) : (TotalCount: 0, Catalogues: new List<DashboardCatalogueDto>());
+            var cataloguesResponse = requestModel.DashboardType.ToLower() == "my-catalogues" ? catalogueNodeVersionRepository.GetCatalogues(requestModel.DashboardType, requestModel.PageNumber, userId) : (TotalCount: 0, Catalogues: new List<DashboardCatalogueDto>());
 
             var catalogueList = cataloguesResponse.Catalogues.Any() ? mapper.Map<List<DashboardCatalogueViewModel>>(cataloguesResponse.Catalogues) : new List<DashboardCatalogueViewModel>();
             if (catalogueList.Any())
@@ -196,19 +201,19 @@ public async Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning
 
             var response = new DashboardMyLearningResponseViewModel
             {
-                Type = dashboardType,
+                Type = requestModel.DashboardType,
                 Resources = resourceList,
                 Catalogues = catalogueList,
                 Activities = myInProgressActivities.Activities,
                 UserCertificates = certificates.Certificates,
-                TotalCount = dashboardType?.ToLower() switch
+                TotalCount = requestModel.DashboardType?.ToLower() switch
                 {
                     "my-catalogues" => cataloguesResponse.TotalCount,
                     "my-in-progress" => myInProgressActivities?.TotalCount ?? 0,
                     "my-certificates" => certificates?.TotalCount ?? 0,
                     _ => resourceCount
                 },
-                CurrentPage = pageNumber,
+                CurrentPage = requestModel.PageNumber,
             };
 
             return response;
@@ -220,11 +225,12 @@ public async Task<DashboardMyLearningResponseViewModel> GetMyCoursesAndElearning
         /// <param name="dashboardTrayLearningResourceType">The dashboardTrayLearningResourceType.</param>
         /// <param name="pageNumber">The pageNumber.</param>
         /// <param name="userId">The user id.</param>
+        /// <param name="email">The email.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearningAsync(string dashboardTrayLearningResourceType, int pageNumber, int userId)
+        public async Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearningAsync(string dashboardTrayLearningResourceType, int pageNumber, int userId, string email)
         {
             List<MyLearningActivitiesViewModel> result = new();
-            List<MoodleEnrolledCourseResponseModel> entrolledCourses = new();
+            MoodleCompletionsApiResponseModel entrolledCourses = new();
             List<MyLearningCombinedActivitiesViewModel> mappedMyLearningActivities = new();
             List<MyLearningCombinedActivitiesViewModel> mappedEnrolledCourses = new();
             if (dashboardTrayLearningResourceType != "courses")
@@ -234,7 +240,7 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearning
 
             if (dashboardTrayLearningResourceType != "elearning")
             {
-                entrolledCourses = await this.moodleApiService.GetInProgressEnrolledCoursesAsync(userId);
+                entrolledCourses = await this.moodleBridgeApiService.GetInProgressEnrolledCoursesAsync(email);
             }
 
             if (result != null)
@@ -269,36 +275,41 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearning
 
             if (entrolledCourses != null)
             {
-                mappedEnrolledCourses = entrolledCourses.Select(course => new MyLearningCombinedActivitiesViewModel
-                {
-                    UserId = userId,
-                    ResourceId = (int)course.Id,
-                    ResourceVersionId = (int)course.Id,
-                    IsCurrentResourceVersion = true,
-                    ResourceReferenceId = (int)course.Id,
-                    MajorVersion = 1,
-                    MinorVersion = 0,
-                    ResourceType = ResourceTypeEnum.Moodle,
-                    Title = course.DisplayName,
-                    CertificateEnabled = course.CertificateEnabled,
-                    ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
-                    ActivityDate = course.LastAccessDate.HasValue
+                var courses = entrolledCourses?.Results ?? Enumerable.Empty<CompletionResult>();
+                mappedEnrolledCourses = courses
+    .Where(r => r.Data?.Courses != null)
+    .SelectMany(r => r.Data.Courses)
+    .Select(course => new MyLearningCombinedActivitiesViewModel
+    {
+        UserId = userId,
+        ResourceId = (int)course.Id,
+        ResourceVersionId = (int)course.Id,
+        IsCurrentResourceVersion = true,
+        ResourceReferenceId = (int)course.Id,
+        MajorVersion = 1,
+        MinorVersion = 0,
+        ResourceType = ResourceTypeEnum.Moodle,
+        Title = course.DisplayName,
+        ResourceUrl = course.CourseUrl,
+        CertificateEnabled = course.CertificateEnabled,
+        ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
+        ActivityDate = course.LastAccessDate.HasValue
                             ? DateTimeOffset.FromUnixTimeSeconds(course.LastAccessDate.Value)
                             : DateTimeOffset.MinValue,
-                    ScorePercentage = Convert.ToInt32(course.ProgressPercentage.TrimEnd('%')),
-                    TotalActivities = course.TotalActivities,
-                    CompletedActivities = course.CompletedActivities,
-                    IsMostRecent = false,
-                    ResourceDurationMilliseconds = 0,
-                    CompletionPercentage = 0,
-                    ProvidersJson = null,
-                    AssesmentScore = 0,
-                    AssessmentPassMark = 0,
-                    AssessmentType = 0,
-                    CertificateAwardedDate = course.EndDate.HasValue
+        ScorePercentage = Convert.ToInt32(course.ProgressPercentage.TrimEnd('%')),
+        TotalActivities = course.TotalActivities,
+        CompletedActivities = course.CompletedActivities,
+        IsMostRecent = false,
+        ResourceDurationMilliseconds = 0,
+        CompletionPercentage = 0,
+        ProvidersJson = null,
+        AssesmentScore = 0,
+        AssessmentPassMark = 0,
+        AssessmentType = 0,
+        CertificateAwardedDate = course.EndDate.HasValue
                             ? DateTimeOffset.FromUnixTimeSeconds(course.EndDate.Value)
                             : DateTimeOffset.MinValue,
-                }).ToList();
+    }).ToList();
             }
 
             // Combine both result sets
@@ -327,16 +338,16 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetMyInprogressLearning
         /// <param name="pageNumber">The pageNumber.</param>
         /// <param name="userId">The user id.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetailsAsync(string dashboardTrayLearningResourceType, int pageNumber, int userId)
+        public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetailsAsync(string dashboardTrayLearningResourceType, int pageNumber, int userId, string email)
         {
             try
             {
-                Task<List<MoodleUserCertificateResponseModel>>? courseCertificatesTask = null;
                 Task<List<UserCertificateViewModel>>? resourceCertificatesTask = null;
+                Task<MoodleCertificateResponseModel>? courseCertificatesTask = null;
 
                 if (dashboardTrayLearningResourceType != "elearning")
                 {
-                    courseCertificatesTask = moodleApiService.GetUserCertificateAsync(userId);
+                    courseCertificatesTask = moodleBridgeApiService.GetUserCertificateAsync(email);
 
                 }
                 if (dashboardTrayLearningResourceType != "courses")
@@ -345,7 +356,7 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
                 }
 
                 // Await all active tasks in parallel
-                if (courseCertificatesTask != null & dashboardTrayLearningResourceType == "all")
+                if (courseCertificatesTask != null && dashboardTrayLearningResourceType == "all")
                     await Task.WhenAll(courseCertificatesTask, resourceCertificatesTask);
                 else if (dashboardTrayLearningResourceType == "elearning")
                     await resourceCertificatesTask;
@@ -361,23 +372,24 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
 
                 if (courseCertificatesTask != null)
                 {
-                    var courseCertificates = courseCertificatesTask.Result ?? Enumerable.Empty<MoodleUserCertificateResponseModel>();
-
-                    mappedCourseCertificates = courseCertificates.Select(c => new UserCertificateViewModel
-                    {
-                        Title = string.IsNullOrWhiteSpace(c.ResourceTitle) ? c.ResourceName : c.ResourceTitle,
-                        ResourceTypeId = (int)ResourceTypeEnum.Moodle,
-                        ResourceReferenceId = 0,
-                        MajorVersion = 0,
-                        MinorVersion = 0,
-                        AwardedDate = c.AwardedDate.HasValue
+                    mappedCourseCertificates = courseCertificatesTask.Result?.Results?
+     .Where(r => r.Data?.Certificates != null)
+     .SelectMany(r => r.Data.Certificates)
+     .Select(c => new UserCertificateViewModel
+     {
+         Title = string.IsNullOrWhiteSpace(c.ResourceTitle) ? c.ResourceName : c.ResourceTitle,
+         ResourceTypeId = (int)ResourceTypeEnum.Moodle,
+         ResourceReferenceId = 0,
+         MajorVersion = 0,
+         MinorVersion = 0,
+         AwardedDate = c.AwardedDate.HasValue
                             ? DateTimeOffset.FromUnixTimeSeconds(c.AwardedDate.Value)
                             : DateTimeOffset.MinValue,
-                        CertificatePreviewUrl = c.PreviewLink,
-                        CertificateDownloadUrl = c.DownloadLink,
-                        ResourceVersionId = 0,
-                        ProvidersJson = null
-                    });
+         CertificatePreviewUrl = c.PreviewLink,
+         CertificateDownloadUrl = c.DownloadLink,
+         ResourceVersionId = 0,
+         ProvidersJson = null
+     }) ?? Enumerable.Empty<UserCertificateViewModel>();
                 }
 
                 var allCertificates = resourceCertificates.Concat(mappedCourseCertificates);
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Findwise/FindwiseApiFacade.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Findwise/FindwiseApiFacade.cs
deleted file mode 100644
index 139c9e41c..000000000
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Findwise/FindwiseApiFacade.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-namespace LearningHub.Nhs.OpenApi.Services.Services.Findwise
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net.Http;
-    using System.Text;
-    using System.Threading.Tasks;
-    using LearningHub.Nhs.Models.Search;
-    using LearningHub.Nhs.OpenApi.Models.Configuration;
-    using LearningHub.Nhs.OpenApi.Services.Interface.HttpClients;
-    using LearningHub.Nhs.OpenApi.Services.Interface.Services;
-    using Microsoft.Extensions.Logging;
-    using Microsoft.Extensions.Options;
-    using Newtonsoft.Json;
-
-    /// <summary>
-    /// The FindwiseApiFacade.
-    /// </summary>
-    public class FindwiseApiFacade : IFindwiseApiFacade
-    {
-        private readonly IFindwiseClient findWiseHttpClient;
-        private readonly FindwiseConfig findwiseConfig;
-        private readonly ILogger<FindwiseApiFacade> logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FindwiseApiFacade"/> class.
-        /// </summary>
-        /// <param name="findWiseHttpClient">The findWiseHttpClient.</param>
-        /// <param name="findwiseConfig">The options.</param>
-        /// <param name="logger">The logger.</param>
-        public FindwiseApiFacade(
-             IFindwiseClient findWiseHttpClient,
-             IOptions<FindwiseConfig> findwiseConfig,
-             ILogger<FindwiseApiFacade> logger)
-        {
-            this.findWiseHttpClient = findWiseHttpClient;
-            this.findwiseConfig = findwiseConfig.Value;
-            this.logger = logger;
-        }
-
-        /// <summary>
-        /// Modifies the information Findwise has for the catalogues provided.
-        /// Documents not in Findwise will be added.
-        /// Documents that already exist in Findwise will be replaced.
-        /// </summary>
-        /// <param name="catalogues">The catalogues to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        public async Task AddOrReplaceAsync(List<SearchCatalogueRequestModel> catalogues)
-        {
-            var request = string.Format(this.findwiseConfig.IndexMethod, this.findwiseConfig.CollectionIds.Catalogue)
-                + $"?token={this.findwiseConfig.Token}";
-            var response = await this.PostAsync(request, catalogues);
-            this.ValidateResponse(response, $"catalogues: {string.Join(',', catalogues.Select(x => x.Id))}");
-        }
-
-        /// <summary>
-        /// Modifies the information Findwise has for the resources provided.
-        /// Documents not in Findwise will be added.
-        /// Documents that already exist in Findwise will be replaced.
-        /// </summary>
-        /// <param name="resources">The resources to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        public async Task AddOrReplaceAsync(List<SearchResourceRequestModel> resources)
-        {
-            var request = string.Format(this.findwiseConfig.IndexMethod, this.findwiseConfig.CollectionIds.Resource)
-                + $"?token={this.findwiseConfig.Token}";
-            var response = await this.PostAsync(request, resources);
-            this.ValidateResponse(response, $"resources: {string.Join(',', resources.Select(x => x.Id))}");
-        }
-
-        /// <summary>
-        /// Removes the documents from Findwise.
-        /// </summary>
-        /// <param name="resources">The resources to remove from Findwise.</param>
-        /// <returns>The task.</returns>
-        public async Task RemoveAsync(List<SearchResourceRequestModel> resources)
-        {
-            var resourceIds = resources.Select(x => x.Id);
-            var idQueryString = string.Join(
-                '&',
-                resourceIds.Select(x => $"id={x}"));
-            var request = string.Format(
-                this.findwiseConfig.IndexMethod,
-                this.findwiseConfig.CollectionIds.Resource)
-                + $"?{idQueryString}&token={this.findwiseConfig.Token}";
-            var response = await this.DeleteAsync(request);
-            this.ValidateResponse(response, $"resources: {string.Join(',', resourceIds)}");
-        }
-
-        private void ValidateResponse(HttpResponseMessage response, string dataForError)
-        {
-            if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-            {
-                logger.LogError($"Updating FindWise failed for {dataForError}  HTTP Status Code:" + response.StatusCode.ToString());
-                throw new Exception("AccessDenied");
-            }
-            else if (!response.IsSuccessStatusCode)
-            {
-                logger.LogError($"Updating FindWise failed for {dataForError}  HTTP Status Code:" + response.StatusCode.ToString());
-                throw new Exception("Posting of resource to search failed: " + dataForError);
-            }
-        }
-
-        private async Task<HttpResponseMessage> PostAsync<T>(string request, T obj)
-            where T : class, new()
-        {
-            var content = GetContent(obj);
-            var client = await GetClientAsync();
-            return await client.PostAsync(request, content).ConfigureAwait(false);
-        }
-
-        private async Task<HttpResponseMessage> DeleteAsync(string request)
-        {
-            var client = await GetClientAsync();
-            return await client.DeleteAsync(request).ConfigureAwait(false);
-        }
-
-        private async Task<HttpClient> GetClientAsync()
-        {
-            return await this.findWiseHttpClient.GetClient(this.findwiseConfig.IndexUrl);
-        }
-
-        private StringContent GetContent<T>(T obj)
-            where T : class, new()
-        {
-            var json = JsonConvert.SerializeObject(obj, new JsonSerializerSettings() { DateFormatString = "yyyy-MM-dd" });
-
-            return new StringContent(json, Encoding.UTF8, "application/json");
-        }
-    }
-}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Findwise/NullFindwiseApiFacade.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Findwise/NullFindwiseApiFacade.cs
deleted file mode 100644
index ef5f8d974..000000000
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/Findwise/NullFindwiseApiFacade.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-namespace LearningHub.Nhs.OpenApi.Services.Services.Findwise
-{
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-    using LearningHub.Nhs.Models.Search;
-    using LearningHub.Nhs.OpenApi.Services.Interface.Services;
-    using Microsoft.Extensions.Logging;
-
-    /// <summary>
-    /// Null implementation of IFindwiseApiFacade for use when Azure Search is enabled.
-    /// This implementation performs no operations and is used to avoid Findwise calls when using Azure Search.
-    /// </summary>
-    public class NullFindwiseApiFacade : IFindwiseApiFacade
-    {
-        private readonly ILogger<NullFindwiseApiFacade> logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NullFindwiseApiFacade"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        public NullFindwiseApiFacade(ILogger<NullFindwiseApiFacade> logger)
-        {
-            this.logger = logger;
-        }
-
-        /// <summary>
-        /// No-op implementation. Does not add or replace catalogues in Findwise.
-        /// </summary>
-        /// <param name="catalogues">The catalogues to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        public Task AddOrReplaceAsync(List<SearchCatalogueRequestModel> catalogues)
-        {
-            this.logger.LogDebug("NullFindwiseApiFacade: Skipping AddOrReplaceAsync for {Count} catalogues (Azure Search is enabled)", catalogues?.Count ?? 0);
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// No-op implementation. Does not add or replace resources in Findwise.
-        /// </summary>
-        /// <param name="resources">The resources to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        public Task AddOrReplaceAsync(List<SearchResourceRequestModel> resources)
-        {
-            this.logger.LogDebug("NullFindwiseApiFacade: Skipping AddOrReplaceAsync for {Count} resources (Azure Search is enabled)", resources?.Count ?? 0);
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// No-op implementation. Does not remove resources from Findwise.
-        /// </summary>
-        /// <param name="resources">The resources to remove from Findwise.</param>
-        /// <returns>The task.</returns>
-        public Task RemoveAsync(List<SearchResourceRequestModel> resources)
-        {
-            this.logger.LogDebug("NullFindwiseApiFacade: Skipping RemoveAsync for {Count} resources (Azure Search is enabled)", resources?.Count ?? 0);
-            return Task.CompletedTask;
-        }
-    }
-}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleApiService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleApiService.cs
index 9630ff24d..f868d946a 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleApiService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleApiService.cs
@@ -43,7 +43,7 @@ public MoodleApiService(IMoodleHttpClient moodleHttpClient, ILogger<MoodleApiSer
         /// <returns>UserId from Moodle.</returns>
         public async Task<int> GetMoodleUserIdByUsernameAsync(int currentUserId)
         {
-            var parameters = new Dictionary<string, string>
+                var parameters = new Dictionary<string, string>
             {
                 { "criteria[0][key]", "username" },
                 { "criteria[0][value]", currentUserId.ToString() }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleBridgeApiService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleBridgeApiService.cs
new file mode 100644
index 000000000..71076c3f9
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleBridgeApiService.cs
@@ -0,0 +1,607 @@
+namespace LearningHub.Nhs.OpenApi.Services.Services
+{
+    using LearningHub.Nhs.Models.Moodle;
+    using LearningHub.Nhs.Models.Moodle.API;
+    using LearningHub.Nhs.Models.MyLearning;
+    using LearningHub.Nhs.Models.Report.ReportCreate;
+    using LearningHub.Nhs.OpenApi.Services.Interface.HttpClients;
+    using LearningHub.Nhs.OpenApi.Services.Interface.Services;
+    using Microsoft.Extensions.Logging;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net;
+    using System.Net.Http;
+    using System.Text;
+    using System.Text.Json;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.OpenApi.Services.Helpers;
+    using System.Net.Http.Json;
+    using static System.Net.WebRequestMethods;
+    using IdentityModel.Client;
+    using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+    using LearningHub.Nhs.Models.User;
+
+    /// <summary>
+    /// MoodleBridgeApiService.
+    /// </summary>
+    public class MoodleBridgeApiService : IMoodleBridgeApiService
+    {
+        private readonly IMoodleBridgeHttpClient moodleBridgeHttpClient;
+        private readonly ILogger logger;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MoodleApiService"/> class.
+        /// </summary>
+        /// <param name="moodleBridgeHttpClient">moodleHttpClient.</param>
+        /// <param name="logger">logger.</param>
+        public MoodleBridgeApiService(IMoodleBridgeHttpClient moodleBridgeHttpClient, ILogger<MoodleApiService> logger)
+        {
+            this.moodleBridgeHttpClient = moodleBridgeHttpClient;
+            this.logger = logger;
+        }
+
+        /// <summary>
+        /// GetUserInstancesByEmailAsync.
+        /// </summary>
+        /// <param name="email">The email.</param>
+        /// <returns>UserId from Moodle.</returns>
+        public async Task<MoodleInstanceUserIdsViewModel> GetUserInstancesByEmail(string email)
+        {
+            MoodleUserIdsResponseModel viewmodel = null;
+
+            try
+            {
+                var client = await this.moodleBridgeHttpClient.GetClient();
+
+                var request = $"/api/v1/Users/{Uri.EscapeDataString(email)}/instance-ids";
+                var response = await client.GetAsync(request).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = await response.Content.ReadAsStringAsync();
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    viewmodel = System.Text.Json.JsonSerializer.Deserialize<MoodleUserIdsResponseModel>(result, options);
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                if (viewmodel?.MoodleUserIds != null)
+                {
+                    return MoodleInstanceUsersHelper.BuildUserIdsByInstance(viewmodel.MoodleUserIds);
+                }
+                else
+                {
+                    throw new Exception("Failed to retrieve Moodle user IDs.");
+                }
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogError(ex, "An error occurred while fetching user instances by email.");
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// UpdateEmail.
+        /// </summary>
+        /// <param name="updateEmailaddressViewModel">The UpdateEmailaddressViewModel.</param>
+        /// <returns></returns>
+        public async Task<MoodleUpdateEmailResponseModel> UpdateEmail(UpdateEmailaddressViewModel updateEmailaddressViewModel)
+        {
+            try
+            {
+                var client = await this.moodleBridgeHttpClient.GetClient();
+
+                var requestUrl = "/api/v1/Users/update-email";
+
+                var options = new JsonSerializerOptions
+                {
+                    PropertyNameCaseInsensitive = true
+                };
+
+                var response = await client.PostAsJsonAsync(requestUrl, updateEmailaddressViewModel)
+                                           .ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = await response.Content.ReadAsStringAsync();
+
+                    var viewModel = System.Text.Json.JsonSerializer.Deserialize<MoodleUpdateEmailResponseModel>(result, options);
+
+                    return viewModel;
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized ||
+                         response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+                else
+                {
+                    var errorContent = await response.Content.ReadAsStringAsync();
+                    throw new Exception($"API Error: {response.StatusCode}, Details: {errorContent}");
+                }
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogError(ex, "An error occurred while updating email.");
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// GetEnrolledCoursesAsync.
+        /// </summary>
+        /// <param name="moodleUserInstanceUserIds">Moodle instances user id.</param>
+        /// <param name="requestModel">MyLearningRequestModel.</param>
+        /// <param name="months">The months.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<MoodleCompletionsApiResponseModel> GetRecentEnrolledCoursesAsync(MoodleInstanceUserIdsViewModel moodleUserInstanceUserIds, MyLearningRequestModel requestModel, int? month = null)
+        {
+            try
+            {
+                if (moodleUserInstanceUserIds?.MoodleInstanceUserIds == null ||
+               !moodleUserInstanceUserIds.MoodleInstanceUserIds.Any())
+                {
+                    throw new ArgumentException("UserIds are required.");
+                }
+
+                string statusFilter = string.Empty; ;
+
+                if ((requestModel.Incomplete && requestModel.Complete) || (!requestModel.Incomplete && !requestModel.Complete))
+                {
+                    statusFilter = string.Empty; ;
+                }
+                else if (requestModel.Incomplete)
+                {
+                    statusFilter = "inprogress";
+                }
+                else
+                {
+                    statusFilter = "completed";
+                }
+
+                var client = await this.moodleBridgeHttpClient.GetClient();
+
+                var queryParams = new List<string>();
+
+                if (!string.IsNullOrWhiteSpace(statusFilter))
+                    queryParams.Add($"statusfilter={statusFilter}");
+
+                if (month.HasValue)
+                    queryParams.Add($"months={month.Value}");
+
+                if (!string.IsNullOrWhiteSpace(requestModel?.SearchText))
+                {
+                    queryParams.Add($"search={Uri.EscapeDataString(requestModel.SearchText)}");
+                }
+
+                var queryString = queryParams.Any()
+                    ? "?" + string.Join("&", queryParams)
+                    : string.Empty;
+
+
+                var requestUri = $"api/v1/users/recent-courses{queryString}";
+
+                var response = await client.PostAsJsonAsync(
+                    requestUri,
+                    moodleUserInstanceUserIds).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    var result = System.Text.Json.JsonSerializer.Deserialize<MoodleCompletionsApiResponseModel>(json, options);
+
+                    return result ?? new MoodleCompletionsApiResponseModel();
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                throw new Exception($"Request failed with status code {response.StatusCode}");
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// GetEnrolledCoursesAsync.
+        /// </summary>
+        /// <param name="moodleUserInstanceUserIds">Moodle Instances user id.</param>
+        /// <param name="requestModel">MyLearningRequestModel requestModel.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<MoodleCompletionsApiResponseModel> GetEnrolledCoursesHistoryAsync(MoodleInstanceUserIdsViewModel moodleUserInstanceUserIds, MyLearningRequestModel requestModel)
+        {
+            try
+            {
+                if (moodleUserInstanceUserIds?.MoodleInstanceUserIds == null ||
+                  !moodleUserInstanceUserIds.MoodleInstanceUserIds.Any())
+                {
+                    throw new ArgumentException("UserIds are required.");
+                }
+
+                string statusFilter = string.Empty; ;
+
+                if ((requestModel.Incomplete && requestModel.Complete) || (!requestModel.Incomplete && !requestModel.Complete))
+                {
+                    statusFilter = string.Empty;
+                }
+                else if (requestModel.Incomplete)
+                {
+                    statusFilter = "inprogress";
+                }
+                else
+                {
+                    statusFilter = "completed";
+                }
+
+                var client = await this.moodleBridgeHttpClient.GetClient();
+                // Build query string (optional params)
+                var queryParams = new List<string>();
+                queryParams.Add($"months=0");
+                if (!string.IsNullOrWhiteSpace(statusFilter))
+                    queryParams.Add($"statusfilter={statusFilter}");
+
+                if (!string.IsNullOrWhiteSpace(requestModel?.SearchText))
+                {
+                    queryParams.Add($"search={Uri.EscapeDataString(requestModel.SearchText)}");
+                }
+
+                var queryString = queryParams.Any()
+                    ? "?" + string.Join("&", queryParams)
+                    : string.Empty;
+
+                var requestUri = $"api/v1/users/recent-courses{queryString}";
+
+                var response = await client.PostAsJsonAsync(
+                   requestUri,
+                   moodleUserInstanceUserIds).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    var result = System.Text.Json.JsonSerializer.Deserialize<MoodleCompletionsApiResponseModel>(json, options);
+
+                    return result ?? new MoodleCompletionsApiResponseModel();
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                throw new Exception($"Request failed with status code {response.StatusCode}");
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// GetInProgressEnrolledCoursesAsync.
+        /// </summary>
+        /// <param name="email">user email.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<MoodleCompletionsApiResponseModel> GetInProgressEnrolledCoursesAsync(string email)
+        {
+            try
+            {
+                var moodleUserInstanceUserIds = await this.GetUserInstancesByEmail(email);
+                if (moodleUserInstanceUserIds?.MoodleInstanceUserIds == null ||
+                  !moodleUserInstanceUserIds.MoodleInstanceUserIds.Any())
+                {
+                    throw new ArgumentException("UserIds are required.");
+                }
+
+                string statusFilter = "inprogress";
+
+                var client = await this.moodleBridgeHttpClient.GetClient();
+                // Build query string (optional params)
+                var queryParams = new List<string>();
+                queryParams.Add($"months=0");
+                if (statusFilter != null)
+                    queryParams.Add($"statusfilter={statusFilter}");
+
+                var queryString = queryParams.Any()
+    ? "?" + string.Join("&", queryParams)
+    : string.Empty;
+
+                var requestUri = $"api/v1/users/recent-courses{queryString}";
+
+                var response = await client.PostAsJsonAsync(
+                    requestUri,
+                    moodleUserInstanceUserIds).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    var result = System.Text.Json.JsonSerializer.Deserialize<MoodleCompletionsApiResponseModel>(json, options);
+
+                    return result ?? new MoodleCompletionsApiResponseModel();
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                throw new Exception($"Request failed with status code {response.StatusCode}");
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// GetUserLearningHistory.
+        /// </summary>
+        /// <param name="email">user email.</param>
+        /// <param name="filterText">The page Number.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<MoodleCertificateResponseModel> GetUserCertificateAsync(string email, string filterText = "")
+        {
+            try
+            {
+                var moodleUserInstanceUserIds = await this.GetUserInstancesByEmail(email);
+                if (moodleUserInstanceUserIds?.MoodleInstanceUserIds == null ||
+                  !moodleUserInstanceUserIds.MoodleInstanceUserIds.Any())
+                {
+                    throw new ArgumentException("UserIds are required.");
+                }
+                var client = await this.moodleBridgeHttpClient.GetClient();
+                // Build query string (optional params)
+                var queryParams = new List<string>();
+                if (!string.IsNullOrWhiteSpace(filterText))
+                {
+                    queryParams.Add($"searchterm={Uri.EscapeDataString(filterText)}");
+                }
+
+                var queryString = queryParams.Any()
+                    ? "?" + string.Join("&", queryParams)
+                    : string.Empty;
+
+
+                var requestUri = $"api/v1/Users/certificates{queryString}";
+
+                var response = await client.PostAsJsonAsync(
+                    requestUri,
+                    moodleUserInstanceUserIds).ConfigureAwait(false);
+
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    var result = await response.Content
+                        .ReadFromJsonAsync<MoodleCertificateResponseModel>(options)
+                        .ConfigureAwait(false);
+
+                    return result ?? new MoodleCertificateResponseModel();
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                throw new Exception($"Request failed with status code {response.StatusCode}");
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// GetUserCertificatefromMoodleInstancesAsync.
+        /// </summary>
+        /// <param name="moodleUserInstanceUserIds">moodleUserInstanceUserIds.</param>
+        /// <param name="filterText">The page Number.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<MoodleCertificateResponseModel> GetUserCertificateFromMoodleInstancesAsync(MoodleInstanceUserIdsViewModel moodleUserInstanceUserIds, string filterText = "")
+        {
+            try
+            {
+                if (moodleUserInstanceUserIds?.MoodleInstanceUserIds == null ||
+                  !moodleUserInstanceUserIds.MoodleInstanceUserIds.Any())
+                {
+                    throw new ArgumentException("UserIds are required.");
+                }
+                var client = await this.moodleBridgeHttpClient.GetClient();
+
+                var queryParams = new List<string>();
+                if (!string.IsNullOrWhiteSpace(filterText))
+                {
+                    queryParams.Add($"searchterm={Uri.EscapeDataString(filterText)}");
+                }
+
+                var queryString = queryParams.Any()
+                    ? "?" + string.Join("&", queryParams)
+                    : string.Empty;
+
+
+                var requestUri = $"api/v1/Users/certificates{queryString}";
+
+                var response = await client.PostAsJsonAsync(
+                    requestUri,
+                    moodleUserInstanceUserIds).ConfigureAwait(false);
+
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    var result = await response.Content
+                        .ReadFromJsonAsync<MoodleCertificateResponseModel>(options)
+                        .ConfigureAwait(false);
+
+                    return result ?? new MoodleCertificateResponseModel();
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                throw new Exception($"Request failed with status code {response.StatusCode}");
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// GetAllMoodleCategoriesAsync.
+        /// </summary>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<List<CategoryResult>> GetAllMoodleCategoriesAsync()
+        {
+            MoodleInstancesCategoriesResponseModel viewmodel = null;
+
+            try
+            {
+                var client = await this.moodleBridgeHttpClient.GetClient();
+
+                var request = $"/api/v1/Courses/categories";
+                var response = await client.GetAsync(request).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = response.Content.ReadAsStringAsync().Result;
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    viewmodel = System.Text.Json.JsonSerializer.Deserialize<MoodleInstancesCategoriesResponseModel>(result, options);
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                return viewmodel.Results;
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogError(ex, "An error occurred while fetching user instances by email.");
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// GetCoursesByCategoryIdAsync.
+        /// </summary>
+        /// <param name="selectedcategoryId">The categoryId.</param>
+        /// <returns></returns>
+        public async Task<MoodleCourseResultsResponseModel> GetCoursesByCategoryIdAsync(string selectedcategoryId)
+        {
+            MoodleCourseResultsResponseModel viewmodel = null;
+            var (instanceName, categoryId) = selectedcategoryId.Split(':') is var p && p.Length == 2 ? (p[0], p[1]) : (null, null);
+
+            try
+            {
+                var client = await this.moodleBridgeHttpClient.GetClient();
+
+                var request = $"api/v1/Courses/search?value={Uri.EscapeDataString(categoryId.ToString())}" + $"&instance={Uri.EscapeDataString(instanceName)}";
+                var response = await client.GetAsync(request).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    viewmodel = System.Text.Json.JsonSerializer
+                        .Deserialize<MoodleCourseResultsResponseModel>(result, options);
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized ||
+                         response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                return viewmodel ?? new MoodleCourseResultsResponseModel();
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogError(ex, "An error occurred while fetching Moodle categories.");
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// GetSubCategoryByCategoryIdAsync.
+        /// </summary>
+        /// <param name="selectedcategoryId">The categoryId.</param>
+        /// <returns></returns>
+        public async Task<List<SubCategoryResult>> GetSubCategoryByCategoryIdAsync(string selectedcategoryId)
+        {
+            MoodleInstanceSubCategoryResponseModel subcategories = null;
+            var (instanceName, categoryId) = selectedcategoryId.Split(':') is var p && p.Length == 2 ? (p[0], p[1]) : (null, null);
+
+            try
+            {
+                var client = await this.moodleBridgeHttpClient.GetClient();
+
+                var request = $"api/v1/Courses/{categoryId}/subcategories?{instanceName}";
+                var response = await client.GetAsync(request).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = response.Content.ReadAsStringAsync().Result;
+                    var options = new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                    };
+
+                    subcategories = System.Text.Json.JsonSerializer.Deserialize<MoodleInstanceSubCategoryResponseModel>(result, options);
+                }
+                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                {
+                    throw new Exception("AccessDenied");
+                }
+
+                return subcategories.Results;
+            }
+            catch (Exception ex)
+            {
+                this.logger.LogError(ex, "An error occurred while fetching sub categories by category id.");
+                throw;
+            }
+        }
+    }
+}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs
index d9c124b89..8d1793650 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs
@@ -12,8 +12,10 @@
     using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.Models.Enums;
+    using LearningHub.Nhs.Models.Moodle;
     using LearningHub.Nhs.Models.Moodle.API;
     using LearningHub.Nhs.Models.MyLearning;
+    using LearningHub.Nhs.Models.Resource.AzureMediaAsset;
     using LearningHub.Nhs.OpenApi.Models.Configuration;
     using LearningHub.Nhs.OpenApi.Repositories.Helpers;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
@@ -75,6 +77,11 @@ public class MyLearningService : IMyLearningService
         /// </summary>
         private readonly IMoodleApiService moodleApiService;
 
+        /// <summary>
+        /// The moodleBridgeApiService.
+        /// </summary>
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
+
         /// <summary>
         /// The mapper.
         /// </summary>
@@ -99,6 +106,7 @@ public class MyLearningService : IMyLearningService
         /// <param name="mediaResourceActivity">The mediaResourceActivity.</param>
         /// <param name="resourceRepository">The resourceActivity</param>
         /// <param name="moodleApiService">The moodleApiService.</param>
+        /// <param name="moodleBridgeApiService">The moodleBridgeApiService.</param>
         public MyLearningService(
             IResourceActivityRepository resourceActivityRepository,
             IMediaResourcePlayedSegmentRepository mediaResourcePlayedSegmentRepository,
@@ -110,7 +118,8 @@ public MyLearningService(
             IScormActivityRepository scormActivityRepository,
             IMediaResourceActivityRepository mediaResourceActivity,
             IResourceRepository resourceRepository,
-            IMoodleApiService moodleApiService)
+            IMoodleApiService moodleApiService,
+            IMoodleBridgeApiService moodleBridgeApiService)
         {
             this.resourceActivityRepository = resourceActivityRepository;
             this.mediaResourcePlayedSegmentRepository = mediaResourcePlayedSegmentRepository;
@@ -123,6 +132,7 @@ public MyLearningService(
             this.mediaResourceActivity = mediaResourceActivity;
             this.resourceRepository = resourceRepository;
             this.moodleApiService = moodleApiService;
+            this.moodleBridgeApiService = moodleBridgeApiService;
         }
 
         /// <summary>
@@ -155,13 +165,12 @@ public async Task<MyLearningDetailedViewModel> GetActivityDetailed(int userId, M
         /// /// <param name="userId">The user id.</param>
         /// <param name="requestModel">The request model.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivitiesAsync(int userId, MyLearningRequestModel requestModel)
+        public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivitiesAsync(int userId, MyLearningApiRequestViewModel requestModel)
         {
             try
             {
-                var result = await resourceActivityRepository.GetUserRecentMyLearningActivities(userId, requestModel);
-
-                var entrolledCourses = await this.moodleApiService.GetRecentEnrolledCoursesAsync(userId, requestModel, 6);
+                var result = await resourceActivityRepository.GetUserRecentMyLearningActivities(userId, requestModel.Request);
+                var entrolledCourses = await this.moodleBridgeApiService.GetRecentEnrolledCoursesAsync(requestModel.MoodleInstanceUserIds, requestModel.Request, 6);
                 List<MyLearningCombinedActivitiesViewModel> mappedMyLearningActivities = new();
                 List<MyLearningCombinedActivitiesViewModel> mappedEnrolledCourses = new();
                 List<MyLearningCombinedActivitiesViewModel> combainedUserActivities = new();
@@ -208,43 +217,47 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearning
 
                 if (entrolledCourses != null)
                 {
-                    mappedEnrolledCourses = entrolledCourses.Select(course => new MyLearningCombinedActivitiesViewModel
-                    {
-                        UserId = userId,
-                        ResourceId = (int)course.Id,
-                        ResourceVersionId = (int)course.Id,
-                        IsCurrentResourceVersion = true,
-                        ResourceReferenceId = (int)course.Id,
-                        MajorVersion = 1,
-                        MinorVersion = 0,
-                        ResourceType = ResourceTypeEnum.Moodle,
-                        Title = course.DisplayName,
-                        CertificateEnabled = course.CertificateEnabled,
-                        ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
-                        ActivityDate = course.LastAccessDate.HasValue
-                            ? DateTimeOffset.FromUnixTimeSeconds(course.LastAccessDate.Value)
-                            : DateTimeOffset.MinValue,
-                        ScorePercentage = Convert.ToInt32(course.ProgressPercentage.TrimEnd('%')),
-                        TotalActivities = course.TotalActivities,
-                        CompletedActivities = course.CompletedActivities,
-                        IsMostRecent = false,
-                        ResourceDurationMilliseconds = 0,
-                        CompletionPercentage = 0,
-                        ProvidersJson = null,
-                        AssessmentPassMark = 0,
-                        AssessmentType = 0,
-                        AssesmentScore = 0,
-                        CertificateAwardedDate = course.EndDate.HasValue
-                            ? DateTimeOffset.FromUnixTimeSeconds(course.EndDate.Value)
-                            : DateTimeOffset.MinValue,
-                    }).ToList();
+                    mappedEnrolledCourses = entrolledCourses?.Results?
+    .Where(r => r.Data?.Courses != null)
+    .SelectMany(r => r.Data.Courses)
+    .Select(course => new MyLearningCombinedActivitiesViewModel
+    {
+        UserId = userId,
+        ResourceId = (int)course.Id,
+        ResourceVersionId = (int)course.Id,
+        IsCurrentResourceVersion = true,
+        ResourceReferenceId = (int)course.Id,
+        MajorVersion = 1,
+        MinorVersion = 0,
+        ResourceType = ResourceTypeEnum.Moodle,
+        Title = course.DisplayName,
+        ResourceUrl = course.CourseUrl,
+        CertificateEnabled = course.CertificateEnabled,
+        ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
+        ActivityDate = course.LastAccessDate.HasValue
+                           ? DateTimeOffset.FromUnixTimeSeconds(course.LastAccessDate.Value)
+                           : DateTimeOffset.MinValue,
+        ScorePercentage = Convert.ToInt32(course.ProgressPercentage.TrimEnd('%')),
+        TotalActivities = course.TotalActivities,
+        CompletedActivities = course.CompletedActivities,
+        IsMostRecent = false,
+        ResourceDurationMilliseconds = 0,
+        CompletionPercentage = 0,
+        ProvidersJson = null,
+        AssessmentPassMark = 0,
+        AssessmentType = 0,
+        AssesmentScore = 0,
+        CertificateAwardedDate = course.EndDate.HasValue
+                           ? DateTimeOffset.FromUnixTimeSeconds(course.EndDate.Value)
+                           : DateTimeOffset.MinValue,
+    }).ToList()?? new List<MyLearningCombinedActivitiesViewModel>(); ;
                 }
 
                 // Combine both result sets
                 combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();
 
 
-                var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Skip).Take(requestModel.Take).ToList();
+                var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Request.Skip).Take(requestModel.Request.Take).ToList();
 
                 // Count total records.
                 MyLearningActivitiesDetailedViewModel viewModel = new MyLearningActivitiesDetailedViewModel()
@@ -268,29 +281,29 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearning
         /// /// <param name="userId">The user id.</param>
         /// <param name="requestModel">The request model.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistoryAsync(int userId, MyLearningRequestModel requestModel)
+        public async Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistoryAsync(int userId, MyLearningApiRequestViewModel requestModel)
         {
             try
             {
-                (string strActivityStatus, bool activityStatusEnumFlag) = resourceActivityRepository.GetActivityStatusFilter(requestModel);
-                (string strResourceTypes, bool resourceTypeFlag) = resourceActivityRepository.ApplyResourceTypesfilters(requestModel);
+                (string strActivityStatus, bool activityStatusEnumFlag) = resourceActivityRepository.GetActivityStatusFilter(requestModel.Request);
+                (string strResourceTypes, bool resourceTypeFlag) = resourceActivityRepository.ApplyResourceTypesfilters(requestModel.Request);
                 var result = new List<MyLearningActivitiesViewModel>();
 
                 if (
-        (!activityStatusEnumFlag && !resourceTypeFlag && !requestModel.Courses) ||
-        (activityStatusEnumFlag && resourceTypeFlag && !requestModel.Courses) ||
-        (activityStatusEnumFlag && !resourceTypeFlag && !requestModel.Courses) ||
-        (!activityStatusEnumFlag && resourceTypeFlag && !requestModel.Courses) ||
-        (!activityStatusEnumFlag && resourceTypeFlag && requestModel.Courses) ||
-        (activityStatusEnumFlag && resourceTypeFlag && requestModel.Courses))
+        (!activityStatusEnumFlag && !resourceTypeFlag && !requestModel.Request.Courses) ||
+        (activityStatusEnumFlag && resourceTypeFlag && !requestModel.Request.Courses) ||
+        (activityStatusEnumFlag && !resourceTypeFlag && !requestModel.Request.Courses) ||
+        (!activityStatusEnumFlag && resourceTypeFlag && !requestModel.Request.Courses) ||
+        (!activityStatusEnumFlag && resourceTypeFlag && requestModel.Request.Courses) ||
+        (activityStatusEnumFlag && resourceTypeFlag && requestModel.Request.Courses))
                 {
-                    if (requestModel.SearchText != null)
+                    if (requestModel.Request.SearchText != null)
                     {
-                        result = await resourceActivityRepository.GetUserLearningHistoryBasedonSearchText(userId, requestModel);
+                        result = await resourceActivityRepository.GetUserLearningHistoryBasedonSearchText(userId, requestModel.Request);
                     }
                     else
                     {
-                        result = await resourceActivityRepository.GetUserLearningHistory(userId, requestModel);
+                        result = await resourceActivityRepository.GetUserLearningHistory(userId, requestModel.Request);
                     }
                 }
 
@@ -338,56 +351,60 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistoryA
                     }).ToList();
                 }
 
-                List<MoodleEnrolledCourseResponseModel> entrolledCourses = new();
+                MoodleCompletionsApiResponseModel entrolledCourses = new();
 
                 if (
-                    (!activityStatusEnumFlag && !resourceTypeFlag && !requestModel.Courses) ||
-                    (!activityStatusEnumFlag && !resourceTypeFlag && requestModel.Courses) ||
-                    (!activityStatusEnumFlag && resourceTypeFlag && requestModel.Courses) ||
-                    (activityStatusEnumFlag && resourceTypeFlag && requestModel.Courses) ||
-                    (activityStatusEnumFlag && !resourceTypeFlag && requestModel.Courses) ||
-                    (activityStatusEnumFlag && !resourceTypeFlag && !requestModel.Courses))
+                    (!activityStatusEnumFlag && !resourceTypeFlag && !requestModel.Request.Courses) ||
+                    (!activityStatusEnumFlag && !resourceTypeFlag && requestModel.Request.Courses) ||
+                    (!activityStatusEnumFlag && resourceTypeFlag && requestModel.Request.Courses) ||
+                    (activityStatusEnumFlag && resourceTypeFlag && requestModel.Request.Courses) ||
+                    (activityStatusEnumFlag && !resourceTypeFlag && requestModel.Request.Courses) ||
+                    (activityStatusEnumFlag && !resourceTypeFlag && !requestModel.Request.Courses))
                 {
-                    entrolledCourses = await this.moodleApiService.GetEnrolledCoursesHistoryAsync(userId, requestModel);
+                    entrolledCourses = await this.moodleBridgeApiService.GetEnrolledCoursesHistoryAsync(requestModel.MoodleInstanceUserIds, requestModel.Request);
                     if (entrolledCourses != null)
                     {
-                        mappedEnrolledCourses = entrolledCourses.Select(course => new MyLearningCombinedActivitiesViewModel
-                        {
-                            UserId = userId,
-                            ResourceId = (int)course.Id,
-                            ResourceVersionId = (int)course.Id,
-                            IsCurrentResourceVersion = true,
-                            ResourceReferenceId = (int)course.Id,
-                            MajorVersion = 1,
-                            MinorVersion = 0,
-                            ResourceType = ResourceTypeEnum.Moodle,
-                            Title = course.DisplayName,
-                            CertificateEnabled = course.CertificateEnabled,
-                            ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
-                            ActivityDate = course.LastAccessDate.HasValue
+                        mappedEnrolledCourses = entrolledCourses?.Results?
+    .Where(r => r.Data?.Courses != null)
+    .SelectMany(r => r.Data.Courses)
+    .Select(course => new MyLearningCombinedActivitiesViewModel
+    {
+        UserId = userId,
+        ResourceId = (int)course.Id,
+        ResourceVersionId = (int)course.Id,
+        IsCurrentResourceVersion = true,
+        ResourceReferenceId = (int)course.Id,
+        MajorVersion = 1,
+        MinorVersion = 0,
+        ResourceType = ResourceTypeEnum.Moodle,
+        Title = course.DisplayName,
+        ResourceUrl = course.CourseUrl,
+        CertificateEnabled = course.CertificateEnabled,
+        ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
+        ActivityDate = course.LastAccessDate.HasValue
                             ? DateTimeOffset.FromUnixTimeSeconds(course.LastAccessDate.Value)
                             : DateTimeOffset.MinValue,
-                            ScorePercentage = int.TryParse(course.ProgressPercentage.TrimEnd('%'), out var score) ? score : 0,
-                            TotalActivities = course.TotalActivities,
-                            CompletedActivities = course.CompletedActivities,
-                            IsMostRecent = false,
-                            ResourceDurationMilliseconds = 0,
-                            CompletionPercentage = 0,
-                            ProvidersJson = null,
-                            AssessmentPassMark = 0,
-                            AssessmentType = 0,
-                            AssesmentScore = 0,
-                            CertificateAwardedDate = course.EndDate.HasValue
+        ScorePercentage = int.TryParse(course.ProgressPercentage.TrimEnd('%'), out var score) ? score : 0,
+        TotalActivities = course.TotalActivities,
+        CompletedActivities = course.CompletedActivities,
+        IsMostRecent = false,
+        ResourceDurationMilliseconds = 0,
+        CompletionPercentage = 0,
+        ProvidersJson = null,
+        AssessmentPassMark = 0,
+        AssessmentType = 0,
+        AssesmentScore = 0,
+        CertificateAwardedDate = course.EndDate.HasValue
                             ? DateTimeOffset.FromUnixTimeSeconds(course.EndDate.Value)
                             : DateTimeOffset.MinValue,
-                        }).ToList();
+    }).ToList()?? new List<MyLearningCombinedActivitiesViewModel>(); 
                     }
                 }
 
                 // Combine both result sets
                 combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();
 
-                var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Skip).Take(requestModel.Take).ToList();
+                var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Request.Skip).Take(requestModel.Request.Take).ToList();
 
                 // Count total records.
                 MyLearningActivitiesDetailedViewModel viewModel = new MyLearningActivitiesDetailedViewModel()
@@ -702,20 +719,19 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
         /// <param name="userId">The user id.</param>
         /// <param name="requestModel">The request model</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetails(int userId, MyLearningRequestModel requestModel)
+        public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDetails(int userId, MyLearningApiRequestViewModel requestModel)
         {
-            Task<List<MoodleUserCertificateResponseModel>>? courseCertificatesTask = null;
-            var filteredResource = GetFilteredResourceType(requestModel);
+            Task<MoodleCertificateResponseModel>? courseCertificatesTask = null;
+            var filteredResource = GetFilteredResourceType(requestModel.Request);
 
-            if (filteredResource.Count() == 0 || (filteredResource.Any() && requestModel.Courses))
+            if (filteredResource.Count() == 0 || (filteredResource.Any() && requestModel.Request.Courses))
             {
-                courseCertificatesTask = !string.IsNullOrWhiteSpace(requestModel.SearchText) ?
-                    moodleApiService.GetUserCertificateAsync(userId, requestModel.SearchText) : moodleApiService.GetUserCertificateAsync(userId);
-
+                courseCertificatesTask = !string.IsNullOrWhiteSpace(requestModel.Request.SearchText) ?
+                    moodleBridgeApiService.GetUserCertificateFromMoodleInstancesAsync(requestModel.MoodleInstanceUserIds, requestModel.Request.SearchText) : moodleBridgeApiService.GetUserCertificateFromMoodleInstancesAsync(requestModel.MoodleInstanceUserIds);
             }
 
-            var resourceCertificatesTask = !string.IsNullOrWhiteSpace(requestModel.SearchText) ?
-                 resourceRepository.GetUserCertificateDetails(userId, requestModel.SearchText) : resourceRepository.GetUserCertificateDetails(userId);
+            var resourceCertificatesTask = !string.IsNullOrWhiteSpace(requestModel.Request.SearchText) ?
+                 resourceRepository.GetUserCertificateDetails(userId, requestModel.Request.SearchText) : resourceRepository.GetUserCertificateDetails(userId);
 
 
             // Await all active tasks in parallel
@@ -730,23 +746,24 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
 
             if (courseCertificatesTask != null)
             {
-                var courseCertificates = courseCertificatesTask.Result ?? Enumerable.Empty<MoodleUserCertificateResponseModel>();
-
-                mappedCourseCertificates = courseCertificates.Select(c => new UserCertificateViewModel
-                {
-                    Title = string.IsNullOrWhiteSpace(c.ResourceTitle) ? c.ResourceName : c.ResourceTitle,
-                    ResourceTypeId = (int)ResourceTypeEnum.Moodle,
-                    ResourceReferenceId = 0,
-                    MajorVersion = 0,
-                    MinorVersion = 0,
-                    AwardedDate = c.AwardedDate.HasValue
+                mappedCourseCertificates = courseCertificatesTask.Result?.Results?
+        .Where(r => r.Data?.Certificates != null)
+        .SelectMany(r => r.Data.Certificates)
+        .Select(c => new UserCertificateViewModel
+        {
+            Title = string.IsNullOrWhiteSpace(c.ResourceTitle) ? c.ResourceName : c.ResourceTitle,
+            ResourceTypeId = (int)ResourceTypeEnum.Moodle,
+            ResourceReferenceId = 0,
+            MajorVersion = 0,
+            MinorVersion = 0,
+            AwardedDate = c.AwardedDate.HasValue
                         ? DateTimeOffset.FromUnixTimeSeconds(c.AwardedDate.Value)
                         : DateTimeOffset.MinValue,
-                    CertificatePreviewUrl = c.PreviewLink,
-                    CertificateDownloadUrl = c.DownloadLink,
-                    ResourceVersionId = 0,
-                    ProvidersJson = null,
-                });
+            CertificatePreviewUrl = c.PreviewLink,
+            CertificateDownloadUrl = c.DownloadLink,
+            ResourceVersionId = 0,
+            ProvidersJson = null,
+        }) ?? Enumerable.Empty<UserCertificateViewModel>();
             }
 
             var allCertificates = resourceCertificates.Concat(mappedCourseCertificates);
@@ -764,8 +781,8 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
 
             var totalCount = orderedCertificates.Count();
             var pagedResults = orderedCertificates
-                .Skip(requestModel.Skip)
-                .Take(requestModel.Take)
+                .Skip(requestModel.Request.Skip)
+                .Take(requestModel.Request.Take)
                 .ToList();
 
             return new MyLearningCertificatesDetailedViewModel
@@ -775,9 +792,6 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet
             };
         }
 
-
-
-
         private IQueryable<ResourceActivity> ApplyFilters(IQueryable<ResourceActivity> query, MyLearningRequestModel requestModel)
         {
             // Text filter - Title, Keywords or Description.
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceSyncService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceSyncService.cs
index ba6e4b243..921f04d7b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceSyncService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceSyncService.cs
@@ -24,7 +24,6 @@ public class ResourceSyncService : IResourceSyncService
         private readonly IResourceVersionRepository resourceVersionRepository;
         private readonly ICatalogueNodeVersionRepository catalogueNodeVersionRepository;
         private readonly IGenericFileResourceVersionRepository genericFileResourceVersionRepository;
-        private readonly IFindwiseApiFacade findwiseApiFacade;
         private readonly IMapper mapper;
 
         /// <summary>
@@ -34,21 +33,18 @@ public class ResourceSyncService : IResourceSyncService
         /// <param name="resourceVersionRepository">The resourceVersionRepository.</param>
         /// <param name="catalogueNodeVersionRepository">The catalogueNodeVersionRepository.</param>
         /// <param name="genericFileResourceVersionRepository">The genericFileResourceVersionRepository.</param>
-        /// <param name="findwiseApiFacade">The findwiseApiFacade.</param>
         /// <param name="mapper">The mapper.</param>
         public ResourceSyncService(
             IResourceSyncRepository resourceSyncRepository,
             IResourceVersionRepository resourceVersionRepository,
             ICatalogueNodeVersionRepository catalogueNodeVersionRepository,
             IGenericFileResourceVersionRepository genericFileResourceVersionRepository,
-            IFindwiseApiFacade findwiseApiFacade,
             IMapper mapper)
         {
             this.resourceSyncRepository = resourceSyncRepository;
             this.resourceVersionRepository = resourceVersionRepository;
             this.catalogueNodeVersionRepository = catalogueNodeVersionRepository;
             this.genericFileResourceVersionRepository = genericFileResourceVersionRepository;
-            this.findwiseApiFacade = findwiseApiFacade;
             this.mapper = mapper;
         }
 
@@ -104,46 +100,6 @@ public List<ResourceAdminSearchResultViewModel> GetSyncListResourcesForUser(int
         /// <returns>The task.</returns>
         public async Task<LearningHubValidationResult> SyncForUserAsync(int userId)
         {
-            // Obtain Resource Version dataset related to the sync list for the supplied User Id.
-            var syncList = resourceSyncRepository.GetSyncListForUser(userId, true).ToList();
-
-            var resources = syncList.Select(x => x.Resource).ToList();
-
-            // Sync Updates
-            var resourcesToUpdate = resources.Where(x => !this.ResourceIsUnpublished(x)).ToList();
-            var resourceVersionIdList = resourcesToUpdate.Select(x => x.Id).ToList();
-            var mappedResourcesToUpdate = await this.BuildSearchResourceRequestModelList(resourceVersionIdList);
-
-            // Validate Findwise submission
-            var invalidResourceDetails = new List<string>();
-            foreach (var r in mappedResourcesToUpdate)
-            {
-                if (!r.IsValidForSubmission())
-                {
-                    invalidResourceDetails.Add(r.Title);
-                }
-            }
-
-            if (invalidResourceDetails.Count > 0)
-            {
-                return new LearningHubValidationResult(false, $"The following Resources are not valid for submission: {string.Join(", ", invalidResourceDetails)}");
-            }
-
-            // Send update to Findwise
-            if (mappedResourcesToUpdate.Any())
-            {
-                await findwiseApiFacade.AddOrReplaceAsync(mappedResourcesToUpdate.ToList());
-            }
-
-            // Synce Deletes
-            var resourcesToDelete = resources.Where(x => this.ResourceIsUnpublished(x)).ToList();
-            var mappedResourcesToDelete = resourcesToDelete.Select(x => mapper.Map<SearchResourceRequestModel>(x)).ToList();
-
-            if (mappedResourcesToDelete.Any())
-            {
-                await findwiseApiFacade.RemoveAsync(mappedResourcesToDelete.ToList());
-            }
-
             await resourceSyncRepository.SetSyncedForUserAsync(userId);
 
             return new LearningHubValidationResult(true);
@@ -243,27 +199,6 @@ public async Task<SearchResourceRequestModel> BuildSearchResourceRequestModel(in
         /// <returns>The task.</returns>
         public async Task<LearningHubValidationResult> SyncSingleAsync(int resourceVersionId)
         {
-            var resourceVersion = GetResourcesWithIncludes().SingleOrDefault(x => x.Id == resourceVersionId);
-            if (resourceVersion == null)
-            {
-                throw new Exception($"No resource version found for id '{resourceVersionId}'");
-            }
-
-            var searchResourceRequestModel = await BuildSearchResourceRequestModel(resourceVersionId);
-            if (ResourceIsUnpublished(resourceVersion))
-            {
-                await findwiseApiFacade.RemoveAsync(new List<SearchResourceRequestModel> { searchResourceRequestModel });
-            }
-            else
-            {
-                if (!searchResourceRequestModel.IsValidForSubmission())
-                {
-                    return new LearningHubValidationResult(false, $"Resource '{resourceVersion.Title}' is not valid for submission to Findwise");
-                }
-
-                await findwiseApiFacade.AddOrReplaceAsync(new List<SearchResourceRequestModel> { searchResourceRequestModel });
-            }
-
             return new LearningHubValidationResult(true);
         }
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
deleted file mode 100644
index d3eb98d67..000000000
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
+++ /dev/null
@@ -1,924 +0,0 @@
-namespace LearningHub.Nhs.OpenApi.Services.Services
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net.Http;
-    using System.Text;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using System.Web;
-    using AutoMapper;
-    using LearningHub.Nhs.Models.Entities.Activity;
-    using LearningHub.Nhs.Models.Entities.Resource;
-    using LearningHub.Nhs.Models.Enums;
-    using LearningHub.Nhs.Models.Search;
-    using LearningHub.Nhs.Models.Search.SearchClick;
-    using LearningHub.Nhs.Models.Validation;
-    using LearningHub.Nhs.Models.ViewModels.Helpers;
-    using LearningHub.Nhs.OpenApi.Models.Configuration;
-    using LearningHub.Nhs.OpenApi.Models.ServiceModels.Findwise;
-    using LearningHub.Nhs.OpenApi.Models.ServiceModels.Resource;
-    using LearningHub.Nhs.OpenApi.Models.ViewModels;
-    using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
-    using LearningHub.Nhs.OpenApi.Services.Helpers;
-    using LearningHub.Nhs.OpenApi.Services.Interface.HttpClients;
-    using LearningHub.Nhs.OpenApi.Services.Interface.Services;
-    using Microsoft.Extensions.Logging;
-    using Microsoft.Extensions.Options;
-    using Newtonsoft.Json;
-    using Event = LearningHub.Nhs.Models.Entities.Analytics.Event;
-
-    /// <summary>
-    /// The search service.
-    /// </summary>
-    public class SearchService : ISearchService
-    {
-
-        /// <summary>
-        /// application id for search.
-        /// </summary>
-        private const string ApplicationId = "HEE";
-
-        /// <summary>
-        /// profile type for search.
-        /// </summary>
-        private const string ProfileType = "SEARCHER";
-
-        private readonly IEventService eventService;
-        private readonly ILearningHubService learningHubService;
-        private readonly IResourceRepository resourceRepository;
-        private readonly IFindwiseClient findwiseClient;
-        private readonly ILogger logger;
-        private readonly FindwiseConfig findwiseConfig;
-        private readonly IMapper mapper;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SearchService"/> class.
-        /// The search service.
-        /// </summary>
-        /// <param name="learningHubService">
-        /// The <see cref="ILearningHubService"/>.
-        /// </param>
-        /// <param name="findwiseClient">
-        /// The <see cref="IFindwiseClient"/>.
-        /// </param>
-        /// <param name="findwiseConfig">
-        /// The <see cref="findwiseConfig"/>.
-        /// </param>
-        /// <param name="resourceRepository">
-        /// The <see cref="IResourceRepository"/>.
-        /// </param>
-        /// <param name="logger">Logger.</param>
-        public SearchService(
-            ILearningHubService learningHubService,
-            IEventService eventService,
-            IFindwiseClient findwiseClient,
-            IOptions<FindwiseConfig> findwiseConfig,
-            IResourceRepository resourceRepository,
-            ILogger<SearchService> logger,
-            IMapper mapper)
-        {
-            this.learningHubService = learningHubService;
-            this.eventService = eventService;
-            this.findwiseClient = findwiseClient;
-            this.resourceRepository = resourceRepository;
-            this.logger = logger;
-            this.mapper = mapper;
-            this.findwiseConfig = findwiseConfig.Value;
-        }
-
-        /// <summary>
-        /// The Get Search Result Async method.
-        /// </summary>
-        /// <param name="searchRequestModel">The search request model.</param>
-        /// <param name="userId">The user id.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<SearchResultModel> GetSearchResultAsync(SearchRequestModel searchRequestModel, int userId, CancellationToken cancellationToken = default)
-        {
-            SearchResultModel viewmodel = new SearchResultModel();
-
-            try
-            {
-                // e.g. if pagesize is 10, then offset would be 0,10,20,30
-                var pageSize = searchRequestModel.PageSize;
-                var offset = searchRequestModel.PageIndex * pageSize;
-
-                var client = await this.findwiseClient.GetClient(this.findwiseConfig.SearchBaseUrl);
-
-                var request = string.Format(
-                    this.findwiseConfig.SearchEndpointPath + "{0}?offset={1}&hits={2}&q={3}&token={4}",
-                    this.findwiseConfig.CollectionIds.Resource,
-                    offset,
-                    pageSize,
-                    this.EncodeSearchText(searchRequestModel.SearchText) + searchRequestModel.FilterText + searchRequestModel.ResourceAccessLevelFilterText + searchRequestModel.ProviderFilterText,
-                    this.findwiseConfig.Token);
-
-                if (searchRequestModel.CatalogueId.HasValue)
-                {
-                    request += $"&catalogue_ids={searchRequestModel.CatalogueId}";
-                }
-
-                // if sort column is requested
-                if (!string.IsNullOrEmpty(searchRequestModel.SortColumn))
-                {
-                    var sortquery = $"&sort={searchRequestModel.SortColumn}";
-
-                    // if sort direction option is requested
-                    if (!string.IsNullOrEmpty(searchRequestModel.SortDirection))
-                    {
-                        var sortdirection = searchRequestModel.SortDirection.StartsWith("asc") ? "asc" : "desc";
-                        sortquery = $"{sortquery}_{sortdirection}";
-                    }
-
-                    request = $"{request}{sortquery}";
-                }
-
-                var response = await client.GetAsync(request).ConfigureAwait(false);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    var result = response.Content.ReadAsStringAsync().Result;
-                    viewmodel = JsonConvert.DeserializeObject<SearchResultModel>(result);
-                    searchRequestModel.TotalNumberOfHits = viewmodel.Stats.TotalHits;
-                }
-                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                {
-                    this.logger.LogError($"Get Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}");
-                    throw new Exception("AccessDenied to FindWise Server");
-                }
-                else
-                {
-                    var error = response.Content.ReadAsStringAsync().Result.ToString();
-                    this.logger.LogError($"Get Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}, Error Message:{error}");
-                    throw new Exception("Error with FindWise Server");
-                }
-
-                return viewmodel;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// The Get Catalogue Search Result Async method.
-        /// </summary>
-        /// <param name="catalogSearchRequestModel">
-        /// The catalog search request model.
-        /// </param>
-        /// <param name="userId">
-        /// The user id.
-        /// </param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task<SearchCatalogueResultModel> GetCatalogueSearchResultAsync(CatalogueSearchRequestModel catalogSearchRequestModel, int userId, CancellationToken cancellationToken = default)
-        {
-            var viewmodel = new SearchCatalogueResultModel();
-
-            try
-            {
-                // e.g. if pagesize is 3, then offset would be 0,3,6,9
-                var offset = catalogSearchRequestModel.PageIndex * catalogSearchRequestModel.PageSize;
-                var client = await this.findwiseClient.GetClient(this.findwiseConfig.SearchBaseUrl);
-                var request = string.Format(
-                    this.findwiseConfig.SearchEndpointPath + "{0}?offset={1}&hits={2}&q={3}&token={4}",
-                    this.findwiseConfig.CollectionIds.Catalogue,
-                    offset,
-                    catalogSearchRequestModel.PageSize,
-                    this.EncodeSearchText(catalogSearchRequestModel.SearchText),
-                    this.findwiseConfig.Token);
-
-                var response = await client.GetAsync(request).ConfigureAwait(false);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    var result = response.Content.ReadAsStringAsync().Result;
-                    viewmodel = JsonConvert.DeserializeObject<SearchCatalogueResultModel>(result);
-                    catalogSearchRequestModel.TotalNumberOfHits = viewmodel.Stats.TotalHits;
-                }
-                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                {
-                    this.logger.LogError($"Get Catalogue Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}");
-                    throw new Exception("AccessDenied to FindWise Server");
-                }
-                else
-                {
-                    var error = response.Content.ReadAsStringAsync().Result.ToString();
-                    this.logger.LogError($"Get Catalogue Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}, Error Message:{error}");
-                    throw new Exception("Error with FindWise Server");
-                }
-
-                var remainingItems = catalogSearchRequestModel.TotalNumberOfHits - offset;
-                var resultsPerPage = remainingItems >= catalogSearchRequestModel.PageSize ? catalogSearchRequestModel.PageSize : remainingItems;
-                LearningHubValidationResult validationResult = await this.CreateCatalogueSearchTerm(catalogSearchRequestModel, resultsPerPage, userId);
-
-                viewmodel.SearchId = validationResult.CreatedId ?? 0;
-
-                return viewmodel;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// The create resource search action async.
-        /// </summary>
-        /// <param name="searchActionResourceModel">
-        /// The search action request model.
-        /// </param>
-        /// <param name="userId">
-        /// The user id.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task<LearningHubValidationResult> CreateResourceSearchActionAsync(SearchActionResourceModel searchActionResourceModel, int userId)
-        {
-            var jsonobj = new
-            {
-                searchActionResourceModel.SearchText,
-                searchActionResourceModel.NodePathId,
-                searchActionResourceModel.ItemIndex,
-                searchActionResourceModel.NumberOfHits,
-                searchActionResourceModel.TotalNumberOfHits,
-                searchActionResourceModel.ResourceReferenceId,
-            };
-
-            var json = JsonConvert.SerializeObject(jsonobj);
-
-            var eventEntity = new Event
-            {
-                EventTypeEnum = EventTypeEnum.SearchLaunchResource,
-                JsonData = json,
-                UserId = userId,
-                GroupId = searchActionResourceModel.GroupId,
-            };
-
-            return await this.eventService.CreateAsync(userId, eventEntity);
-        }
-
-        /// <summary>
-        /// The create catalogue search action async.
-        /// </summary>
-        /// <param name="searchActionCatalogueModel">
-        /// The search action request model.
-        /// </param>
-        /// <param name="userId">
-        /// The user id.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task<LearningHubValidationResult> CreateCatalogueSearchActionAsync(SearchActionCatalogueModel searchActionCatalogueModel, int userId)
-        {
-            var jsonobj = new
-            {
-                searchActionCatalogueModel.SearchText,
-                searchActionCatalogueModel.NodePathId,
-                searchActionCatalogueModel.ItemIndex,
-                searchActionCatalogueModel.NumberOfHits,
-                searchActionCatalogueModel.TotalNumberOfHits,
-                searchActionCatalogueModel.CatalogueId,
-            };
-
-            var json = JsonConvert.SerializeObject(jsonobj);
-
-            var eventEntity = new Event();
-            eventEntity.EventTypeEnum = EventTypeEnum.SearchLaunchCatalogue;
-            eventEntity.JsonData = json;
-            eventEntity.UserId = userId;
-            eventEntity.GroupId = searchActionCatalogueModel.GroupId;
-
-            return await this.eventService.CreateAsync(userId, eventEntity);
-        }
-
-        /// <summary>
-        /// The create catalogue resource search action async.
-        /// </summary>
-        /// <param name="searchActionResourceModel">
-        /// The search action request model.
-        /// </param>
-        /// <param name="userId">
-        /// The user id.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task<LearningHubValidationResult> CreateCatalogueResourceSearchActionAsync(SearchActionResourceModel searchActionResourceModel, int userId)
-        {
-            var jsonobj = new
-            {
-                searchActionResourceModel.SearchText,
-                searchActionResourceModel.NodePathId,
-                searchActionResourceModel.ItemIndex,
-                searchActionResourceModel.ResourceReferenceId,
-                searchActionResourceModel.NumberOfHits,
-                searchActionResourceModel.TotalNumberOfHits,
-            };
-
-            var json = JsonConvert.SerializeObject(jsonobj);
-
-            var eventEntity = new Event();
-            eventEntity.EventTypeEnum = EventTypeEnum.LaunchCatalogueResource;
-            eventEntity.JsonData = json;
-            eventEntity.UserId = userId;
-            eventEntity.GroupId = searchActionResourceModel.GroupId;
-
-            return await this.eventService.CreateAsync(userId, eventEntity);
-        }
-
-        /// <summary>
-        /// The submt feedback async.
-        /// </summary>
-        /// <param name="searchFeedbackModel">The search feedback.</param>
-        /// <param name="userId">The user id.</param>
-        /// <returns>The event id.</returns>
-        public async Task<LearningHubValidationResult> SubmitFeedbackAsync(SearchFeedBackModel searchFeedbackModel, int userId)
-        {
-            var jsonobj = new
-            {
-                searchFeedbackModel.SearchText,
-                searchFeedbackModel.Feedback,
-                searchFeedbackModel.TotalNumberOfHits,
-            };
-
-            var json = JsonConvert.SerializeObject(jsonobj);
-
-            var eventEntity = new Event();
-            eventEntity.EventTypeEnum = EventTypeEnum.SearchSubmitFeedback;
-            eventEntity.JsonData = json;
-            eventEntity.UserId = userId;
-            eventEntity.GroupId = searchFeedbackModel.GroupId;
-
-            return await this.eventService.CreateAsync(userId, eventEntity);
-        }
-
-        /// <summary>
-        /// Create search term event entry.
-        /// </summary>
-        /// <param name="searchRequestModel">search request model.</param>
-        /// <param name="userId">user id.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<LearningHubValidationResult> CreateSearchTermEvent(SearchRequestModel searchRequestModel, int userId)
-        {
-            // e.g. if pagesize is 10, then offset would be 0,10,20,30
-            var pageSize = searchRequestModel.PageSize;
-            var offset = searchRequestModel.PageIndex * pageSize;
-
-            var remainingItems = searchRequestModel.TotalNumberOfHits - offset;
-            var resultsPerPage = remainingItems >= pageSize ? pageSize : remainingItems;
-
-            var searchEventModel = this.mapper.Map<SearchEventModel>(searchRequestModel);
-            searchEventModel.ItemsViewed = resultsPerPage;
-            var json = JsonConvert.SerializeObject(searchEventModel);
-
-            var eventEntity = new Event();
-            eventEntity.EventTypeEnum = searchRequestModel.EventTypeEnum;
-            eventEntity.JsonData = json;
-            eventEntity.UserId = userId;
-            eventEntity.GroupId = searchRequestModel.GroupId;
-
-            return await this.eventService.CreateAsync(userId, eventEntity);
-        }
-
-        /// <summary>
-        /// Create catalogue search term event.
-        /// </summary>
-        /// <param name="catalogueSearchRequestModel">catalogue search request model.</param>
-        /// <param name="userId">user id.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<LearningHubValidationResult> CreateCatalogueSearchTermEvent(CatalogueSearchRequestModel catalogueSearchRequestModel, int userId)
-        {
-            // e.g. if pagesize is 3, then offset would be 0,3,6,9
-            var offset = catalogueSearchRequestModel.PageIndex * catalogueSearchRequestModel.PageSize;
-
-            var remainingItems = catalogueSearchRequestModel.TotalNumberOfHits - offset;
-            var resultsPerPage = remainingItems >= catalogueSearchRequestModel.PageSize ? catalogueSearchRequestModel.PageSize : remainingItems;
-
-            var searchCatalogueEventModel = this.mapper.Map<SearchCatalogueEventModel>(catalogueSearchRequestModel);
-            searchCatalogueEventModel.ItemsViewed = resultsPerPage;
-            var json = JsonConvert.SerializeObject(searchCatalogueEventModel);
-            var eventEntity = new Event();
-            eventEntity.EventTypeEnum = catalogueSearchRequestModel.EventTypeEnum;
-            eventEntity.JsonData = json;
-            eventEntity.UserId = userId;
-            eventEntity.GroupId = catalogueSearchRequestModel.GroupId;
-
-            return await this.eventService.CreateAsync(userId, eventEntity);
-        }
-
-
-        /// <summary>
-        /// The create resource search action async.
-        /// </summary>
-        /// <param name="searchActionResourceModel">
-        /// The search action request model.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task<bool> SendResourceSearchEventClickAsync(SearchActionResourceModel searchActionResourceModel)
-        {
-            var searchClickPayloadModel = this.mapper.Map<SearchClickPayloadModel>(searchActionResourceModel);
-            searchClickPayloadModel.TimeOfClick = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            searchClickPayloadModel.SearchSignal.ProfileSignature.ApplicationId = ApplicationId;
-            searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileType = ProfileType;
-            searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileId = this.findwiseConfig.CollectionIds.Resource;
-
-            return await this.SendSearchEventClickAsync(searchClickPayloadModel, true);
-        }
-
-        /// <summary>
-        /// Create catalogue search term.
-        /// </summary>
-        /// <param name="catalogueSearchRequestModel">catalogue search request model.</param>
-        /// <param name="resultsPerPage">results per page.</param>
-        /// <param name="userId">user id.</param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task<LearningHubValidationResult> CreateCatalogueSearchTerm(CatalogueSearchRequestModel catalogueSearchRequestModel, int resultsPerPage, int userId)
-        {
-            var searchCatalogueEventModel = this.mapper.Map<SearchCatalogueEventModel>(catalogueSearchRequestModel);
-            searchCatalogueEventModel.ItemsViewed = resultsPerPage;
-            var json = JsonConvert.SerializeObject(searchCatalogueEventModel);
-            var eventEntity = new Event();
-            eventEntity.EventTypeEnum = catalogueSearchRequestModel.EventTypeEnum;
-            eventEntity.JsonData = json;
-            eventEntity.UserId = userId;
-            eventEntity.GroupId = catalogueSearchRequestModel.GroupId;
-
-            return await this.eventService.CreateAsync(userId, eventEntity);
-        }
-
-
-
-        /// <inheritdoc />
-        public async Task<ResourceSearchResultModel> Search(ResourceSearchRequest query, int? currentUserId)
-        {
-            var findwiseResultModel = await this.findwiseClient.Search(query);
-
-            if (findwiseResultModel.FindwiseRequestStatus != FindwiseRequestStatus.Success)
-            {
-                return ResourceSearchResultModel.FailedWithStatus(findwiseResultModel.FindwiseRequestStatus);
-            }
-
-            var resourceMetadataViewModels = await this.GetResourceMetadataViewModels(findwiseResultModel, currentUserId);
-
-            var totalHits = findwiseResultModel.SearchResults?.Stats.TotalHits;
-
-            return new ResourceSearchResultModel(
-                resourceMetadataViewModels,
-                findwiseResultModel.FindwiseRequestStatus,
-                totalHits ?? 0);
-        }
-
-        /// <summary>
-        /// The remove resource from search async method.
-        /// </summary>
-        /// <param name="resourceId">The resource to be removed from search.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task RemoveResourceFromSearchAsync(int resourceId)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(this.findwiseConfig.IndexMethod))
-                {
-                    this.logger.LogWarning("The FindWiseIndexMethod is not configured. Resource not removed from search.");
-                }
-                else
-                {
-                    var client = await this.findwiseClient.GetClient(this.findwiseConfig.IndexUrl);
-
-                    var request = string.Format(this.findwiseConfig.IndexMethod, this.findwiseConfig.CollectionIds.Resource) + $"?id={resourceId.ToString()}&token={this.findwiseConfig.Token}";
-
-                    var response = await client.DeleteAsync(request).ConfigureAwait(false);
-
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                    {
-                        throw new Exception("AccessDenied");
-                    }
-                    else if (!response.IsSuccessStatusCode)
-                    {
-                        throw new Exception("Removal of resource to search failed: " + resourceId.ToString());
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("Removal of resource from search failed: " + resourceId.ToString() + " : " + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// The send resource for search Async method.
-        /// </summary>
-        /// <param name="searchResourceRequestModel">The resource to be added to search.</param>
-        /// <param name="userId">The user id.</param>
-        /// <param name="iterations">number of iterations.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<bool> SendResourceForSearchAsync(SearchResourceRequestModel searchResourceRequestModel, int userId, int? iterations)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(this.findwiseConfig.IndexMethod))
-                {
-                    this.logger.LogWarning("The FindWiseIndexMethod is not configured. Resource not added to search results");
-                }
-                else
-                {
-                    List<SearchResourceRequestModel> resourceList =[searchResourceRequestModel];
-
-                    var json = JsonConvert.SerializeObject(resourceList, new JsonSerializerSettings() { DateFormatString = "yyyy-MM-dd" });
-
-                    var stringContent = new StringContent(json, UnicodeEncoding.UTF8, "application/json");
-                    var client = await this.findwiseClient.GetClient(this.findwiseConfig.IndexUrl);
-
-                    var request = string.Format(this.findwiseConfig.SearchBaseUrl, this.findwiseConfig.CollectionIds.Resource) + $"?token={this.findwiseConfig.Token}";
-                    var response = await client.PostAsync(request, stringContent).ConfigureAwait(false);
-                    iterations--;
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                    {
-                        this.logger.LogError("Save to FindWise failed for resourceId:" + searchResourceRequestModel.Id.ToString() + "HTTP Status Code:" + response.StatusCode.ToString());
-                        throw new Exception("AccessDenied");
-                    }
-                    else if (!response.IsSuccessStatusCode)
-                    {
-                        if (iterations < 0)
-                        {
-                            this.logger.LogError("Save to FindWise failed for resourceId:" + searchResourceRequestModel.Id.ToString() + "HTTP Status Code:" + response.StatusCode.ToString());
-                            throw new Exception("Posting of resource to search failed: " + stringContent);
-                        }
-
-                        await this.SendResourceForSearchAsync(searchResourceRequestModel, userId, iterations);
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("Posting of resource to search failed: " + searchResourceRequestModel.Id + " : " + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// The create catalogue search action async.
-        /// </summary>
-        /// <param name="searchActionCatalogueModel">
-        /// The search action request model.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task<bool> SendCatalogueSearchEventAsync(SearchActionCatalogueModel searchActionCatalogueModel)
-        {
-            var searchClickPayloadModel = this.mapper.Map<SearchClickPayloadModel>(searchActionCatalogueModel);
-            searchClickPayloadModel.TimeOfClick = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            searchClickPayloadModel.SearchSignal.ProfileSignature.ApplicationId = ApplicationId;
-            searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileType = ProfileType;
-            searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileId = this.findwiseConfig.CollectionIds.Catalogue;
-
-            return await this.SendSearchEventClickAsync(searchClickPayloadModel, false);
-        }
-
-        /// <summary>
-        /// Gets AllCatalogue search results from findwise api call.
-        /// </summary>
-        /// <param name="catalogSearchRequestModel">The allcatalog search request model.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<SearchAllCatalogueResultModel> GetAllCatalogueSearchResultsAsync(AllCatalogueSearchRequestModel catalogSearchRequestModel)
-        {
-            var viewmodel = new SearchAllCatalogueResultModel();
-            try
-            {
-                var offset = catalogSearchRequestModel.PageIndex * catalogSearchRequestModel.PageSize;
-                var client = await this.findwiseClient.GetClient(this.findwiseConfig.SearchBaseUrl);
-                var request = string.Format(
-                    this.findwiseConfig.SearchEndpointPath + "{0}?offset={1}&hits={2}&q={3}&token={4}",
-                    this.findwiseConfig.CollectionIds.Catalogue,
-                    offset,
-                    catalogSearchRequestModel.PageSize,
-                    this.EncodeSearchText(catalogSearchRequestModel.SearchText),
-                    this.findwiseConfig.Token);
-
-                var response = await client.GetAsync(request).ConfigureAwait(false);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    var result = response.Content.ReadAsStringAsync().Result;
-                    viewmodel = JsonConvert.DeserializeObject<SearchAllCatalogueResultModel>(result);
-                }
-                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                {
-                    this.logger.LogError($"Get AllCatalogue Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}");
-                    throw new Exception("AccessDenied to FindWise Server");
-                }
-                else
-                {
-                    var error = response.Content.ReadAsStringAsync().Result.ToString();
-                    this.logger.LogError($"Get AllCatalogue Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}, Error Message:{error}");
-                    throw new Exception("Error with FindWise Server");
-                }
-
-                return viewmodel;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// The Get Auto suggestion Results Async method.
-        /// </summary>
-        /// <param name="term">The term.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term, CancellationToken cancellationToken = default)
-        {
-            var viewmodel = new AutoSuggestionModel();
-
-            try
-            {
-                var client = await this.findwiseClient.GetClient(this.findwiseConfig.SearchBaseUrl);
-                var request = string.Format(
-                   this.findwiseConfig.SearchEndpointPath + "{0}?q={1}&token={2}",
-                   this.findwiseConfig.CollectionIds.AutoSuggestion,
-                   this.EncodeSearchText(term),
-                   this.findwiseConfig.Token);
-
-
-                var response = await client.GetAsync(request).ConfigureAwait(false);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    var result = response.Content.ReadAsStringAsync().Result;
-                    viewmodel = JsonConvert.DeserializeObject<AutoSuggestionModel>(result);
-                }
-                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                {
-                    this.logger.LogError($"Get Auto Suggetion Result failed in FindWise, HTTP Status Code:{response.StatusCode}");
-                    throw new Exception("AccessDenied to FindWise Server");
-                }
-                else
-                {
-                    var error = response.Content.ReadAsStringAsync().Result.ToString();
-                    this.logger.LogError($"Get Auto Suggetion Result failed in FindWise, HTTP Status Code:{response.StatusCode}, Error Message:{error}");
-                    throw new Exception("Error with FindWise Server");
-                }
-
-                return viewmodel;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
-
-        /// <summary>
-        /// The AutoSuggestion Event action async.
-        /// </summary>
-        /// <param name="clickPayloadModel">
-        /// The clic kPayload Model.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        public async Task<bool> SendAutoSuggestionEventAsync(AutoSuggestionClickPayloadModel clickPayloadModel)
-        {
-            clickPayloadModel.TimeOfClick = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            clickPayloadModel.SearchSignal.ProfileSignature.ApplicationId = ApplicationId;
-            clickPayloadModel.SearchSignal.ProfileSignature.ProfileType = ProfileType;
-            clickPayloadModel.SearchSignal.ProfileSignature.ProfileId = this.findwiseConfig.CollectionIds.AutoSuggestion;
-
-            return await this.SendAutoSuggestionEventClickAsync(clickPayloadModel);
-        }
-
-        /// <summary>
-        /// Send search click payload.
-        /// </summary>
-        /// <param name="searchClickPayloadModel">search click payload model.</param>
-        /// <param name="isResource">isResource.</param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        private async Task<bool> SendSearchEventClickAsync(SearchClickPayloadModel searchClickPayloadModel, bool isResource)
-        {
-            var eventType = isResource ? "resource" : "catalog";
-
-            try
-            {
-                if (string.IsNullOrEmpty(this.findwiseConfig.UrlClickComponent))
-                {
-                    this.logger.LogWarning($"The UrlClickComponent is not configured. {eventType} click event not send to FindWise.");
-                }
-                else
-                {
-                    var json = JsonConvert.SerializeObject(searchClickPayloadModel);
-                    var base64EncodedString = BinaryFormatterHelper.Base64EncodeObject(json);
-
-                    var request = $"{this.findwiseConfig.UrlClickComponent}?payload={base64EncodedString}";
-
-                    var client = await this.findwiseClient.GetClient(this.findwiseConfig.SearchBaseUrl);
-                    var response = await client.PostAsync(request, null).ConfigureAwait(false);
-
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                    {
-                        this.logger.LogError($"Click event save to FindWise failed for {eventType}: {searchClickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
-                        throw new Exception("AccessDenied");
-                    }
-                    else if (!response.IsSuccessStatusCode)
-                    {
-                        this.logger.LogError($"Click event save to FindWise failed for {eventType}: {searchClickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
-                        throw new Exception($"Click event save to FindWise failed for {eventType}: {json}");
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-            catch (Exception ex)
-            {
-                throw new Exception($"Click event save to FindWise failed for {eventType}: {searchClickPayloadModel.ClickTargetUrl} :  {ex.Message}");
-            }
-        }
-
-        /// <summary>
-        /// Send auto suggestion click payload.
-        /// </summary>
-        /// <param name="clickPayloadModel">search click payload model.</param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        private async Task<bool> SendAutoSuggestionEventClickAsync(AutoSuggestionClickPayloadModel clickPayloadModel)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(this.findwiseConfig.UrlAutoSuggestionClickComponent))
-                {
-                    this.logger.LogWarning($"The UrlClickComponent is not configured. Auto suggestion click event not send to FindWise.");
-                }
-                else
-                {
-                    var json = JsonConvert.SerializeObject(clickPayloadModel);
-                    var base64EncodedString = BinaryFormatterHelper.Base64EncodeObject(json);
-
-                    var request = $"{this.findwiseConfig.UrlAutoSuggestionClickComponent}?payload={base64EncodedString}";
-
-                    var client = await this.findwiseClient.GetClient(this.findwiseConfig.SearchBaseUrl);
-                    var response = await client.PostAsync(request, null).ConfigureAwait(false);
-
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                    {
-                        this.logger.LogError($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
-                        throw new Exception("AccessDenied");
-                    }
-                    else if (!response.IsSuccessStatusCode)
-                    {
-                        this.logger.LogError($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
-                        throw new Exception($"Click event save to FindWise failed for Auto suggestion: {json}");
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-            catch (Exception ex)
-            {
-                throw new Exception($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} :  {ex.Message}");
-            }
-        }
-
-
-        private string EncodeSearchText(string searchText)
-        {
-            string specialSearchCharacters = this.findwiseConfig.SpecialSearchCharacters;
-
-            // Add backslash to the start of the string
-            specialSearchCharacters = specialSearchCharacters.Replace(@"\", null);
-            specialSearchCharacters = @"\" + specialSearchCharacters;
-
-            for (int i = 0; i < specialSearchCharacters.Length; i++)
-            {
-                searchText = searchText.Replace(specialSearchCharacters[i].ToString(), @"\" + specialSearchCharacters[i]);
-            }
-
-            searchText = HttpUtility.UrlEncode(searchText);
-            return searchText;
-        }
-
-        private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModels(
-            FindwiseResultModel findwiseResultModel, int? currentUserId)
-        {
-            List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
-            List<ResourceMetadataViewModel> resourceMetadataViewModels = new List<ResourceMetadataViewModel>() { };
-            var documentsFound = findwiseResultModel.SearchResults?.DocumentList.Documents?.ToList() ??
-                                 new List<Document>();
-            var findwiseResourceIds = documentsFound.Select(d => int.Parse(d.Id)).ToList();
-
-            if (!findwiseResourceIds.Any())
-            {
-                return new List<ResourceMetadataViewModel>();
-            }
-
-            var resourcesFound = await this.resourceRepository.GetResourcesFromIds(findwiseResourceIds);
-
-            if (currentUserId.HasValue)
-            {
-                List<int> resourceIds = resourcesFound.Select(x => x.Id).ToList();
-                List<int> userIds = new List<int>() { currentUserId.Value };
-
-                resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
-            }
-
-            resourceMetadataViewModels = resourcesFound.Select(resource => this.MapToViewModel(resource, resourceActivities.Where(x => x.ResourceId == resource.Id).ToList()))
-                .OrderBySequence(findwiseResourceIds)
-                .ToList();
-
-            var unmatchedResources = findwiseResourceIds
-                .Except(resourceMetadataViewModels.Select(r => r.ResourceId)).ToList();
-
-            if (unmatchedResources.Any())
-            {
-                var unmatchedResourcesIdsString = string.Join(", ", unmatchedResources);
-                this.logger.LogWarning(
-                    "Findwise returned documents that were not found in the database with IDs: " +
-                    unmatchedResourcesIdsString);
-            }
-
-            return resourceMetadataViewModels;
-        }
-
-        private ResourceMetadataViewModel MapToViewModel(Resource resource, List<ResourceActivityDTO> resourceActivities)
-        {
-            var hasCurrentResourceVersion = resource.CurrentResourceVersion != null;
-            var hasRating = resource.CurrentResourceVersion?.ResourceVersionRatingSummary != null;
-
-            List<MajorVersionIdActivityStatusDescription> majorVersionIdActivityStatusDescription = new List<MajorVersionIdActivityStatusDescription>() { };
-
-            if (resourceActivities != null && resourceActivities.Count != 0)
-            {
-                majorVersionIdActivityStatusDescription = ActivityStatusHelper.GetMajorVersionIdActivityStatusDescriptionLSPerResource(resource, resourceActivities)
-                    .ToList();
-            }
-
-            if (!hasCurrentResourceVersion)
-            {
-                this.logger.LogInformation(
-                    $"Resource with id {resource.Id} is missing a current resource version");
-            }
-
-            if (!hasRating)
-            {
-                this.logger.LogInformation(
-                    $"Resource with id {resource.Id} is missing a ResourceVersionRatingSummary");
-            }
-
-            var resourceTypeNameOrEmpty = resource.GetResourceTypeNameOrEmpty();
-            if (resourceTypeNameOrEmpty == string.Empty)
-            {
-                this.logger.LogError($"Resource has unrecognised type: {resource.ResourceTypeEnum}");
-            }
-
-
-            return new ResourceMetadataViewModel(
-                resource.Id,
-                resource.CurrentResourceVersion?.Title ?? ResourceHelpers.NoResourceVersionText,
-                resource.CurrentResourceVersion?.Description ?? string.Empty,
-                resource.ResourceReference.Select(this.GetResourceReferenceViewModel).ToList(),
-                resourceTypeNameOrEmpty,
-                resource.CurrentResourceVersion?.MajorVersion ?? 0,
-                resource.CurrentResourceVersion?.ResourceVersionRatingSummary?.AverageRating ?? 0.0m,
-                majorVersionIdActivityStatusDescription
-                );
-        }
-
-        private ResourceReferenceViewModel GetResourceReferenceViewModel(
-            ResourceReference resourceReference)
-        {
-            return new ResourceReferenceViewModel(
-                resourceReference.OriginalResourceReferenceId,
-                resourceReference.GetCatalogue(),
-                this.learningHubService.GetResourceLaunchUrl(resourceReference.OriginalResourceReferenceId));
-        }
-    }
-}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs
index 73c887df7..56b9450ef 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Startup.cs
@@ -7,7 +7,6 @@ namespace LearningHub.Nhs.OpenApi.Services
     using LearningHub.Nhs.OpenApi.Services.Interface.Services.Messaging;
     using LearningHub.Nhs.OpenApi.Services.Services;
     using LearningHub.Nhs.OpenApi.Services.Services.AzureSearch;
-    using LearningHub.Nhs.OpenApi.Services.Services.Findwise;
     using LearningHub.Nhs.OpenApi.Services.Services.Messaging;
     using LearningHub.Nhs.Services;
     using Microsoft.Extensions.Configuration;
@@ -34,11 +33,11 @@ public static void AddServices(this IServiceCollection services, IConfiguration
             }
             else
             {
-                services.AddScoped<IFindwiseClient, FindwiseClient>();
-                services.AddScoped<ISearchService, SearchService>();
+                services.AddScoped<IFindwiseClient, FindwiseClient>();                
             }
 
             services.AddHttpClient<IMoodleHttpClient, MoodleHttpClient>();
+            services.AddHttpClient<IMoodleBridgeHttpClient, MoodleBridgeHttpClient>();
             services.AddScoped<IDatabricksApiHttpClient, DatabricksApiHttpClient>();
             services.AddScoped<ILearningHubService, LearningHubService>();
             services.AddScoped<IResourceService, ResourceService>();
@@ -90,17 +89,8 @@ public static void AddServices(this IServiceCollection services, IConfiguration
             services.AddScoped<IProviderService, ProviderService>();
             services.AddScoped<IUserProviderService, UserProviderService>();
             services.AddScoped<IUserGroupService, UserGroupService>();
+            services.AddScoped<IMoodleBridgeApiService, MoodleBridgeApiService>();
             services.AddScoped<IUserPasswordResetRequestsService, UserPasswordResetRequestsService>();
-
-            // Register IFindwiseApiFacade based on feature flag
-            if (useAzureSearch)
-            {
-                services.AddScoped<IFindwiseApiFacade, NullFindwiseApiFacade>();
-            }
-            else
-            {
-                services.AddScoped<IFindwiseApiFacade, FindwiseApiFacade>();
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj
index 93461ce2b..f4251a236 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj
@@ -11,7 +11,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentAssertions" Version="5.10.3" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
 		<PackageReference Include="Moq" Version="4.16.1" />
 		<PackageReference Include="NBuilder" Version="6.1.0" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/CatalogueServiceTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/CatalogueServiceTests.cs
index 29e37935a..8eec10b9d 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/CatalogueServiceTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/CatalogueServiceTests.cs
@@ -38,7 +38,6 @@ public class CatalogueServiceTests
         private readonly Mock<IBookmarkRepository> bookmarkRepository;
         private readonly Mock<INodeRepository> nodeRepository;
         private readonly Mock<INodeActivityRepository> nodeActivityRepository;
-        private readonly Mock<IFindwiseApiFacade> findwiseApiFacade;
         private readonly Mock<IOptions<LearningHubConfig>> learningHubConfig;
         private readonly Mock<IOptions<FindwiseConfig>> findwiseConfig;
         private readonly Mock<INotificationSenderService> notificationSenderService;
@@ -65,13 +64,12 @@ public CatalogueServiceTests()
             this.bookmarkRepository = new Mock<IBookmarkRepository>();
             this.nodeRepository = new Mock<INodeRepository>();
             this.nodeActivityRepository = new Mock<INodeActivityRepository>();
-            this.findwiseApiFacade = new Mock<IFindwiseApiFacade>();
             this.learningHubConfig = new Mock<IOptions<LearningHubConfig>>();
             this.findwiseConfig = new Mock<IOptions<FindwiseConfig>>();
             this.notificationSenderService = new Mock<INotificationSenderService>();
             this.timezoneOffsetManager = new Mock<ITimezoneOffsetManager>();
             this.categoryService = new Mock<ICategoryService>();
-            this.catalogueService = new CatalogueService(this.catalogueRepository.Object, this.categoryService.Object, this.nodeRepository.Object, this.userUserGroupRepository.Object, this.mapper.Object, this.findwiseConfig.Object, this.learningHubConfig.Object, this.catalogueNodeVersionRepository.Object, this.nodeResourceRepository.Object, this.resourceVersionRepository.Object, this.roleUserGroupRepository.Object, this.providerService.Object, this.catalogueAccessRequestRepository.Object, this.userRepository.Object, this.userProfileRepository.Object, this.emailSenderService.Object, this.bookmarkRepository.Object, this.nodeActivityRepository.Object, this.findwiseApiFacade.Object,this.notificationSenderService.Object,this.timezoneOffsetManager.Object);
+            this.catalogueService = new CatalogueService(this.catalogueRepository.Object, this.categoryService.Object, this.nodeRepository.Object, this.userUserGroupRepository.Object, this.mapper.Object, this.findwiseConfig.Object, this.learningHubConfig.Object, this.catalogueNodeVersionRepository.Object, this.nodeResourceRepository.Object, this.resourceVersionRepository.Object, this.roleUserGroupRepository.Object, this.providerService.Object, this.catalogueAccessRequestRepository.Object, this.userRepository.Object, this.userProfileRepository.Object, this.emailSenderService.Object, this.bookmarkRepository.Object, this.nodeActivityRepository.Object, this.notificationSenderService.Object,this.timezoneOffsetManager.Object);
         }
 
         private static IEnumerable<CatalogueNodeVersion> CatalogueNodeVersionList => new List<CatalogueNodeVersion>()
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/SearchServiceTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/SearchServiceTests.cs
index d8d0568b2..bc4f1407c 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/SearchServiceTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/SearchServiceTests.cs
@@ -20,6 +20,7 @@ namespace LearningHub.Nhs.OpenApi.Tests.Services.Services
     using LearningHub.Nhs.OpenApi.Services.Interface.HttpClients;
     using LearningHub.Nhs.OpenApi.Services.Interface.Services;
     using LearningHub.Nhs.OpenApi.Services.Services;
+    using LearningHub.Nhs.OpenApi.Services.Services.AzureSearch;
     using LearningHub.Nhs.OpenApi.Tests.TestHelpers;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Logging.Abstractions;
@@ -33,11 +34,13 @@ public class SearchServiceTests
         private readonly Mock<ILearningHubService> learningHubService;
         private readonly Mock<IResourceRepository> resourceRepository;
         private readonly Mock<IResourceService> resourceService;
+        private readonly Mock<ICachingService> cachingService;
         private readonly Mock<IEventService> eventService;
-        private readonly SearchService searchService;
+        private readonly AzureSearchService searchService;
         private readonly Mock<IOptions<FindwiseConfig>> findwiseConfig;
-        private Mock<ILogger<SearchService>> mockLogger;
+        private Mock<ILogger<AzureSearchService>> mockLogger;
         private readonly Mock<IMapper> mapper;
+        private readonly Mock<IOptions<AzureSearchConfig>> azureSearchConfig;
 
         public SearchServiceTests()
         {
@@ -45,19 +48,22 @@ public SearchServiceTests()
             this.learningHubService = new Mock<ILearningHubService>();
             this.resourceRepository = new Mock<IResourceRepository>();
             this.resourceService = new Mock<IResourceService>();
+            this.cachingService = new Mock<ICachingService>();
+            this.azureSearchConfig = new Mock<IOptions<AzureSearchConfig>>();
             this.eventService = new Mock<IEventService>();
             this.mapper = new Mock<IMapper>();
 
             this.findwiseConfig = new Mock<IOptions<FindwiseConfig>>();
-            this.mockLogger = new Mock<ILogger<SearchService>>();
-            this.searchService = new SearchService(
+            this.mockLogger = new Mock<ILogger<AzureSearchService>>();
+            this.searchService = new AzureSearchService(
                 this.learningHubService.Object,
                 this.eventService.Object,
-                this.findwiseClient.Object,
-                this.findwiseConfig.Object,
+                this.azureSearchConfig.Object,
                 this.resourceRepository.Object,
+                this.cachingService.Object,
                 this.mockLogger.Object,
-                this.mapper.Object);
+                this.mapper.Object
+                );
         }
 
         public static IEnumerable<object[]> TestFindwiseResultModel => new[]
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Configuration/ConfigurationExtensions.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Configuration/ConfigurationExtensions.cs
index 309eb8bd5..07c0e431b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Configuration/ConfigurationExtensions.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Configuration/ConfigurationExtensions.cs
@@ -46,10 +46,16 @@ public static class ConfigurationExtensions
         public const string AzureSectionName = "Azure";
 
         /// <summary>
-        /// The FindwiseSectionName.
+        /// The MoodleSectionName.
         /// </summary>
         public const string MoodleSectionName = "Moodle";
 
+        /// <summary>
+        /// The MoodleBridgeSectionName.
+        /// </summary>
+        public const string MoodleBridgeSectionName = "MoodleBridgeAPIConfig";
+
+
         /// <summary>
         /// The DatabricksSectionName.
         /// </summary>
@@ -83,6 +89,8 @@ public static void AddConfig(this IServiceCollection services, IConfiguration co
 
             services.AddOptions<MoodleConfig>().Bind(config.GetSection(MoodleSectionName));
 
+            services.AddOptions<MoodleBridgeAPIConfig>().Bind(config.GetSection(MoodleBridgeSectionName));
+
             services.AddOptions<DatabricksConfig>().Bind(config.GetSection(DatabricksSectionName));
 
             services.AddOptions<FeatureFlagsConfig>().Bind(config.GetSection(FeatureFlagsSectionName));
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CategoryController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CategoryController.cs
index cc4b65562..f0e11089e 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CategoryController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CategoryController.cs
@@ -19,16 +19,19 @@ public class CategoryController : OpenApiControllerBase
     {
         private readonly ICategoryService categoryService;
         private readonly IMoodleApiService moodleApiService;
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CategoryController"/> class.
         /// </summary>
         /// <param name="categoryService">The category service.</param>
         /// <param name="moodleApiService">The moodleApi service.</param>
-        public CategoryController(ICategoryService categoryService, IMoodleApiService moodleApiService)
+        /// <param name="moodleBridgeApiService">The moodle Bridge Api service.</param>
+        public CategoryController(ICategoryService categoryService, IMoodleApiService moodleApiService, IMoodleBridgeApiService moodleBridgeApiService)
         {
             this.categoryService = categoryService;
             this.moodleApiService = moodleApiService;
+            this.moodleBridgeApiService = moodleBridgeApiService;
         }
 
         /// <summary>
@@ -51,9 +54,9 @@ public async Task<IActionResult> GetCatalogueVersionCategory(int catalogueNodeVe
         /// <returns>The catalogue.</returns>
         [HttpGet]
         [Route("GetCoursesByCategoryId/{categoryId}")]
-        public async Task<IActionResult> GetCoursesByCategoryId(int categoryId)
+        public async Task<IActionResult> GetCoursesByCategoryId(string categoryId)
         {
-            var courses = await this.moodleApiService.GetCoursesByCategoryIdAsync(categoryId);
+            var courses = await this.moodleBridgeApiService.GetCoursesByCategoryIdAsync(categoryId);
             return this.Ok(courses);
         }
 
@@ -64,9 +67,9 @@ public async Task<IActionResult> GetCoursesByCategoryId(int categoryId)
         /// <returns>The catalogue.</returns>
         [HttpGet]
         [Route("GetSubCategoryByCategoryId/{categoryId}")]
-        public async Task<IActionResult> GetSubCategoryByCategoryId(int categoryId)
+        public async Task<IActionResult> GetSubCategoryByCategoryId(string categoryId)
         {
-            var subCategories = await this.moodleApiService.GetSubCategoryByCategoryIdAsync(categoryId);
+            var subCategories = await this.moodleBridgeApiService.GetSubCategoryByCategoryIdAsync(categoryId);
             return this.Ok(subCategories);
         }
     }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/DashboardController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/DashboardController.cs
index 987904d94..6131a92ec 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/DashboardController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/DashboardController.cs
@@ -1,6 +1,7 @@
 namespace LearningHub.NHS.OpenAPI.Controllers
 {
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.MyLearning;
     using LearningHub.Nhs.OpenApi.Services.Interface.Services;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -37,7 +38,7 @@ public DashboardController(IUserService userService, IDashboardService dashboard
         [Route("resources/{dashboardType}/{pageNumber}")]
         public async Task<ActionResult> GetResources(string dashboardType, int pageNumber = 1)
         {
-           var response = await dashboardService.GetResources(dashboardType, pageNumber, this.CurrentUserId.GetValueOrDefault());
+           var response = await this.dashboardService.GetResources(dashboardType, pageNumber, this.CurrentUserId.GetValueOrDefault());
            return this.Ok(response);
         }
 
@@ -51,7 +52,7 @@ public async Task<ActionResult> GetResources(string dashboardType, int pageNumbe
         [Route("catalogues/{dashboardType}/{pageNumber}")]
         public async Task<IActionResult> GetCatalogues(string dashboardType, int pageNumber = 1)
         {
-            var response = await dashboardService.GetCatalogues(dashboardType, pageNumber, this.CurrentUserId.GetValueOrDefault());
+            var response = await this.dashboardService.GetCatalogues(dashboardType, pageNumber, this.CurrentUserId.GetValueOrDefault());
             return this.Ok(response);
         }
 
@@ -65,22 +66,20 @@ public async Task<IActionResult> GetCatalogues(string dashboardType, int pageNum
         [Route("myaccesslearning/{dashboardType}/{pageNumber}")]
         public async Task<ActionResult> GetMyAccessLearnings(string dashboardType, int pageNumber = 1)
         {
-            var response = await dashboardService.GetMyAccessLearnings(dashboardType, pageNumber, this.CurrentUserId.GetValueOrDefault());
+            var response = await this.dashboardService.GetMyAccessLearnings(dashboardType, pageNumber, this.CurrentUserId.GetValueOrDefault());
             return this.Ok(response);
         }
 
         /// <summary>
         /// Gets Catalogues.
         /// </summary>
-        /// <param name="dashboardTrayLearningResourceType">The dashboardTrayLearningResource type.</param>
-        /// <param name="dashboardType">The dashboard type.</param>
-        /// <param name="pageNumber">The page Number.</param>
+        /// <param name="request">The GetMyCoursesAndElearningRequestModel.</param>
         /// <returns>IActionResult.</returns>
-        [HttpGet]
-        [Route("GetMyCoursesAndElearning/{dashboardTrayLearningResourceType}/{dashboardType}/{pageNumber}")]
-        public async Task<ActionResult> GetMyCoursesAndElearning(string dashboardTrayLearningResourceType, string dashboardType, int pageNumber = 1)
+        [HttpPost]
+        [Route("GetMyCoursesAndElearning")]
+        public async Task<ActionResult> GetMyCoursesAndElearning([FromBody] GetMyCoursesAndElearningRequestModel request)
         {
-            var response = await dashboardService.GetMyCoursesAndElearning(dashboardTrayLearningResourceType, dashboardType, pageNumber, this.CurrentUserId.GetValueOrDefault(), "All");
+            var response = await this.dashboardService.GetMyCoursesAndElearning(request, this.CurrentUserId.GetValueOrDefault(), "All");
             return this.Ok(response);
         }
     }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/MoodleBridgeController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/MoodleBridgeController.cs
new file mode 100644
index 000000000..5f8b67774
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/MoodleBridgeController.cs
@@ -0,0 +1,66 @@
+namespace LearningHub.NHS.OpenAPI.Controllers
+{
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Mvc;
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.OpenApi.Services.Interface.Services;
+    using LearningHub.Nhs.Models.User;
+
+    /// <summary>
+    /// Moodle Bridge operations.
+    /// </summary>
+    [Route("MoodleBridge")]
+    [ApiController]
+    [Authorize]
+    public class MoodleBridgeController : Controller
+    {
+        private readonly IMoodleBridgeApiService moodleBridgeApiService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MoodleBridgeController"/> class.
+        /// </summary>
+        /// <param name="moodleBridgeApiService">The moodle bridge service.</param>
+        public MoodleBridgeController(IMoodleBridgeApiService moodleBridgeApiService)
+        {
+            this.moodleBridgeApiService = moodleBridgeApiService;
+        }
+
+        /// <summary>
+        /// The GetMoodle Instances UserIds.
+        /// </summary>
+        /// <param name="email">The LH user email.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpGet]
+        [Route("GetUserInstancesByEmail/{email}")]
+        public async Task<IActionResult> GetUserInstancesByEmail(string email)
+        {
+                var moodleUser = await this.moodleBridgeApiService.GetUserInstancesByEmail(email);
+                return this.Ok(moodleUser);
+        }
+
+        /// <summary>
+        /// The GetMoodle Instances UserIds.
+        /// </summary>
+        /// <param name="email">The LH user email.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        [Route("UpdateEmail")]
+        public async Task<IActionResult> UpdateEmail([FromBody] UpdateEmailaddressViewModel updateEmailaddressViewModel)
+        {
+            var emailUpdateResponse = await this.moodleBridgeApiService.UpdateEmail(updateEmailaddressViewModel);
+            return this.Ok(emailUpdateResponse);
+        }
+
+        /// <summary>
+        /// GetAllMoodleCategoriesAsync.
+        /// </summary>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        [HttpGet]
+        [Route("GetAllMoodleCategories")]
+        public async Task<IActionResult> GetAllMoodleCategoriesAsync()
+        {
+            var moodleCategories = await this.moodleBridgeApiService.GetAllMoodleCategoriesAsync();
+            return this.Ok(moodleCategories);
+        }
+    }
+}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/MyLearningController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/MyLearningController.cs
index 4763f21cc..fbd05a867 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/MyLearningController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/MyLearningController.cs
@@ -59,7 +59,7 @@ public async Task<IActionResult> GetActivityDetailed([FromBody] MyLearningReques
         /// <returns>The <see cref="IActionResult"/>.</returns>
         [HttpPost]
         [Route("GetUserRecentMyLearningActivities")]
-        public async Task<IActionResult> GetUserRecentMyLearningActivities([FromBody] MyLearningRequestModel requestModel)
+        public async Task<IActionResult> GetUserRecentMyLearningActivities([FromBody] MyLearningApiRequestViewModel requestModel)
         {
             var activityModel = await this.myLearningService.GetUserRecentMyLearningActivitiesAsync(this.CurrentUserId.GetValueOrDefault(), requestModel);
             return this.Ok(activityModel);
@@ -72,7 +72,7 @@ public async Task<IActionResult> GetUserRecentMyLearningActivities([FromBody] My
         /// <returns>The <see cref="IActionResult"/>.</returns>
         [HttpPost]
         [Route("GetUserLearningHistory")]
-        public async Task<IActionResult> GetUserLearningHistory([FromBody] MyLearningRequestModel requestModel)
+        public async Task<IActionResult> GetUserLearningHistory([FromBody] MyLearningApiRequestViewModel requestModel)
         {
             var activityModel = await this.myLearningService.GetUserLearningHistoryAsync(this.CurrentUserId.GetValueOrDefault(), requestModel);
             return this.Ok(activityModel);
@@ -118,7 +118,7 @@ public async Task<IActionResult> GetResourceCertificateDetails(int resourceRefer
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
         [HttpPost]
         [Route("GetUserCertificateDetails")]
-        public async Task<IActionResult> GetUserCertificateDetails([FromBody] MyLearningRequestModel requestModel)
+        public async Task<IActionResult> GetUserCertificateDetails([FromBody] MyLearningApiRequestViewModel requestModel)
         {
             var certificateDetails = await this.myLearningService.GetUserCertificateDetails(this.CurrentUserId.GetValueOrDefault(), requestModel);
             return this.Ok(certificateDetails);
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj b/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj
index de5b7a6d7..b4bfab382 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj
@@ -19,7 +19,7 @@
         <PackageReference Include="AspNetCore.Authentication.ApiKey" Version="8.0.1" />
         <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
         <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-        <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+        <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
         <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
         <PackageReference Include="Microsoft.ApplicationInsights.NLogTarget" Version="2.22.0" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.36" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/appsettings.json b/OpenAPI/LearningHub.Nhs.OpenApi/appsettings.json
index 42b84d3b8..3a96c27b9 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/appsettings.json
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/appsettings.json
@@ -156,6 +156,10 @@
     "ApiWsRestFormat": "json",
     "ApiWsToken": ""
   },
+  "MoodleBridgeAPIConfig": {
+    "BaseUrl": "",
+    "Token": ""
+  },
   "Databricks": {
     "InstanceUrl": "",
     "Token": "",
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 2a259d6b2..96ff6ae13 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="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 	</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 aebb8bb75..70e3e863b 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="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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 acfb75739..c4944deb0 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="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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 9d86c24a0..d02c44881 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="4.0.12" />
+	  <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
index f31ff35e5..5ad3e0d51 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="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
 
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/HierarchyController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/HierarchyController.cs
index ff6d5d560..3af6c645e 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/HierarchyController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/HierarchyController.cs
@@ -473,12 +473,6 @@ public async Task<IActionResult> PublishHierarchyEdit(PublishHierarchyEditViewMo
             try
             {
                 int publicationId = await this.hierarchyService.PublishHierarchyEditAsync(publishViewModel);
-
-                /* TODO - IT2 - confirm submission to Findwise (why here rather than in service method just called?)
-                if (publicationId > 0)
-                {
-                    this.hierarchyService.ConfirmSubmissionToSearch(publicationId, publishViewModel.UserId);
-                } */
             }
             catch (Exception ex)
             {
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceSyncController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceSyncController.cs
index 0228c54b2..8846029e1 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceSyncController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceSyncController.cs
@@ -67,11 +67,11 @@ public async Task<IActionResult> RemoveFromSyncList(List<int> resourceIds)
         }
 
         /// <summary>
-        /// The SyncWithFindwise.
+        /// The Sync.
         /// </summary>
         /// <returns>The action result.</returns>
         [HttpPost("Sync")]
-        public async Task<IActionResult> SyncWithFindwise()
+        public async Task<IActionResult> Sync()
         {
             var vr = await this.resourceSyncService.SyncForUserAsync(this.CurrentUserId);
             return this.Ok(new ApiResponse(vr.IsValid, vr));
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs
index ea4d10d04..1e6f72e35 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs
@@ -312,7 +312,7 @@ private async Task<SearchViewModel> GetSearchResults(SearchRequestModel searchRe
             searchViewModel.DocumentModel = results.DocumentList.Documents.ToList();
             searchViewModel.SearchString = searchRequestModel.SearchText;
             searchViewModel.Hits = results.DocumentList.Documents.Count();
-            searchViewModel.DescriptionMaximumLength = this.settings.Findwise.MaximumDescriptionLength;
+            searchViewModel.DescriptionMaximumLength = this.settings.AzureSearch.MaximumDescriptionLength;
             searchViewModel.ErrorOnAPI = results.ErrorsOnAPICall;
             searchViewModel.Facets = results.Facets;
 
@@ -418,7 +418,7 @@ private async Task<SearchCatalogueViewModel> GetCatalogueSearchResults(Catalogue
                 DocumentModel = documents,
                 SearchString = catalogueSearchRequestModel.SearchText,
                 Hits = results.DocumentList.Documents.Count(),
-                DescriptionMaximumLength = this.settings.Findwise.MaximumDescriptionLength,
+                DescriptionMaximumLength = this.settings.AzureSearch.MaximumDescriptionLength,
                 ErrorOnAPI = results.ErrorsOnAPICall,
                 Facets = results.Facets,
             };
@@ -491,7 +491,7 @@ private async Task<SearchAllCatalogueViewModel> GetAllCatalogueResults(AllCatalo
                 DocumentModel = documents,
                 SearchString = catalogueSearchRequestModel.SearchText,
                 Hits = results.DocumentList.Documents.Count(),
-                DescriptionMaximumLength = this.settings.Findwise.MaximumDescriptionLength,
+                DescriptionMaximumLength = this.settings.AzureSearch.MaximumDescriptionLength,
                 ErrorOnAPI = results.ErrorsOnAPICall,
                 Facets = results.Facets,
             };
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 3a7660599..ce240b56f 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -29,7 +29,7 @@
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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..108504bc2 100644
--- a/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs
+++ b/WebAPI/LearningHub.Nhs.API/Startup/ServiceMappings.cs
@@ -39,7 +39,6 @@ namespace LearningHub.Nhs.Api
     using LearningHub.Nhs.Repository.Report;
     using LearningHub.Nhs.Repository.Resources;
     using LearningHub.Nhs.Services;
-    using LearningHub.Nhs.Services.Findwise;
     using LearningHub.Nhs.Services.Interface;
     using LearningHub.Nhs.Services.Interface.Messaging;
     using LearningHub.Nhs.Services.Interface.Report;
@@ -218,7 +217,6 @@ public static void AddLearningHubMappings(this IServiceCollection services, ICon
             services.AddScoped<IFileTypeService, FileTypeService>();
             services.AddScoped<IHierarchyService, HierarchyService>();
             services.AddScoped<INotificationService, NotificationService>();
-            services.AddScoped<IFindWiseHttpClient, FindWiseHttpClient>();
             services.AddScoped<ISearchService, SearchService>();
             services.AddScoped<ISecurityService, SecurityService>();
             services.AddScoped<IPermissionService, PermissionService>();
@@ -235,7 +233,6 @@ public static void AddLearningHubMappings(this IServiceCollection services, ICon
             services.AddTransient<IEventService, EventService>();
             services.AddTransient<ICatalogueService, CatalogueService>();
             services.AddScoped<IResourceSyncService, ResourceSyncService>();
-            services.AddScoped<IFindwiseApiFacade, FindwiseApiFacade>();
             services.AddScoped<IEmailSenderService, EmailSenderService>();
             services.AddScoped<IEmailTemplateService, EmailTemplateService>();
             services.AddScoped<IMessageService, MessageService>();
diff --git a/WebAPI/LearningHub.Nhs.API/appsettings.json b/WebAPI/LearningHub.Nhs.API/appsettings.json
index b35cc9fe6..5498a983a 100644
--- a/WebAPI/LearningHub.Nhs.API/appsettings.json
+++ b/WebAPI/LearningHub.Nhs.API/appsettings.json
@@ -83,21 +83,8 @@
       }
     },
 
-    "FindWise": {
-      "IndexUrl": "",
-      "SearchUrl": "",
-      "CollectionIds": {
-        "Resource": "",
-        "Catalogue": "",
-        "AutoSuggestion": ""
-      },
-      "UrlSearchComponent": "rest/apps/HEE/searchers/{0}",
-      "UrlClickComponent": "rest/apps/HEE/searchers/hee/signals/hee/signal/click",
-      "UrlAutoSuggestionClickComponent": "rest/apps/HEE/searchers/hee/signals/hee/signal/click-hee",
-      "Token": "",
-      "MaximumDescriptionLength": 150,
-      "IndexMethod": "/rest/v2/collections/{0}/documents",
-      "DescriptionLengthLimit": 3000
+    "AzureSearch": {      
+      "MaximumDescriptionLength": 150
     },
     "Notifications": {
       "PublishResourceTimeToProcessInSec": 30,
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/AzureSearchSettings.cs b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/AzureSearchSettings.cs
new file mode 100644
index 000000000..796306ac7
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/AzureSearchSettings.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LearningHub.Nhs.Api.Shared.Configuration
+{
+    /// <summary>
+    /// The Azure AI Search configuration settings.
+    /// </summary>
+    public class AzureSearchSettings
+    {
+        /// <summary>
+        /// Gets or sets the maximum description length.
+        /// </summary>
+        public int MaximumDescriptionLength { get; set; } = 150;
+    }
+}
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseCollectionIdSettings.cs b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseCollectionIdSettings.cs
deleted file mode 100644
index b83dc6805..000000000
--- a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseCollectionIdSettings.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace LearningHub.Nhs.Api.Shared.Configuration
-{
-    /// <summary>
-    /// The FindwiseCollectionIdSettings.
-    /// </summary>
-    public class FindwiseCollectionIdSettings
-    {
-        /// <summary>
-        /// Gets or sets the resource collection id.
-        /// </summary>
-        public string Resource { get; set; }
-
-        /// <summary>
-        /// Gets or sets the catalogue collection id.
-        /// </summary>
-        public string Catalogue { get; set; }
-
-        /// <summary>
-        /// Gets or sets the AutoSuggestion collection id.
-        /// </summary>
-        public string AutoSuggestion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the moodle collection id.
-        /// </summary>
-        public string Moodle { get; set; }
-    }
-}
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs
deleted file mode 100644
index aa3802eee..000000000
--- a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-namespace LearningHub.Nhs.Api.Shared.Configuration
-{
-    /// <summary>
-    /// The FindwiseSettings.
-    /// </summary>
-    public class FindwiseSettings
-    {
-        /// <summary>
-        /// Gets or sets the index url.
-        /// </summary>
-        public string IndexUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets the search url.
-        /// </summary>
-        public string SearchUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets the url search component.
-        /// </summary>
-        public string UrlSearchComponent { get; set; }
-
-        /// <summary>
-        /// Gets or sets the url click component.
-        /// </summary>
-        public string UrlClickComponent { get; set; }
-
-        /// <summary>
-        /// Gets or sets the url AutoSuggestion click component.
-        /// </summary>
-        public string UrlAutoSuggestionClickComponent { get; set; }
-
-        /// <summary>
-        /// Gets or sets the token.
-        /// </summary>
-        public string Token { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum description length.
-        /// </summary>
-        public int MaximumDescriptionLength { get; set; }
-
-        /// <summary>
-        /// Gets or sets the index method.
-        /// </summary>
-        public string IndexMethod { get; set; }
-
-        /// <summary>
-        /// Gets or sets the collection ids.
-        /// </summary>
-        public FindwiseCollectionIdSettings CollectionIds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Description length limit.
-        /// </summary>
-        public int DescriptionLengthLimit { get; set; }
-    }
-}
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/MigrationToolSettings.cs b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/MigrationToolSettings.cs
index bcfa50e66..76e66990c 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/MigrationToolSettings.cs
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/MigrationToolSettings.cs
@@ -1,7 +1,7 @@
 namespace LearningHub.Nhs.Api.Shared.Configuration
 {
     /// <summary>
-    /// The FindwiseSettings.
+    /// The MigrationToolSettings.
     /// </summary>
     public class MigrationToolSettings
     {
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/Settings.cs b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/Settings.cs
index 13b2b0654..544e9a0f0 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/Settings.cs
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/Settings.cs
@@ -133,9 +133,9 @@ public class Settings
         public MigrationToolSettings MigrationTool { get; set; }
 
         /// <summary>
-        /// Gets or sets the findwise settings.
+        /// Gets or sets the Azure Search settings.
         /// </summary>
-        public FindwiseSettings Findwise { get; set; }
+        public AzureSearchSettings AzureSearch { get; set; }
 
         /// <summary>
         /// Gets or sets the azure storage account connectionstring for queue.
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 e1b7896b8..12b019206 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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 4acbd2e13..70c6f8f9d 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentAssertions" Version="8.0.1" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index a6a0db7ad..5b4022af9 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -102,6 +102,7 @@
     <Folder Include="Stored Procedures\External" />
     <Folder Include="Tables\Databricks" />
     <Folder Include="Stored Procedures\Adf" />
+    <Folder Include="Tables\MIB" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\learningHub_Data.sql" />
@@ -565,6 +566,10 @@
     <Build Include="Stored Procedures\Adf\AdfMergeUserProfileData.sql" />
     <Build Include="Stored Procedures\Adf\AdfMergeHubUser.sql" />
     <Build Include="Stored Procedures\Adf\AdfMergeattribute.sql" />
+    <Build Include="Tables\MIB\MoodleInstanceConfigs.sql" />
+    <None Include="Scripts\Post-Deploy\Scripts\TD-7116-mib_new_env.sql" />
+    <None Include="Scripts\Post-Deploy\Scripts\TD-7106-Resume-Databricks-Ingestion.sql" />
+    <None Include="Scripts\Pre-Deploy\Scripts\ActivateChangeTracking.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql
index 34ba8ad39..2b2bcda6e 100644
--- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql
@@ -86,4 +86,5 @@ UPDATE [resources].[ResourceVersion] SET CertificateEnabled = 0 WHERE VersionSta
 :r .\Scripts\AttributeData.sql 
 :r .\Scripts\PPSXFileType.sql
 :r .\Scripts\UpdateFileTypes.sql
-
+:r .\Scripts\TD-7116-mib_new_env.sql
+:r .\Scripts\TD-7106-Resume-Databricks-Ingestion.sql
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-7106-Resume-Databricks-Ingestion.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-7106-Resume-Databricks-Ingestion.sql
new file mode 100644
index 000000000..920980036
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-7106-Resume-Databricks-Ingestion.sql
@@ -0,0 +1,17 @@
+IF EXISTS (
+    SELECT 1
+    FROM sys.change_tracking_databases
+    WHERE database_id = DB_ID()
+)
+BEGIN
+    PRINT 'Change Tracking is enabled. Executing setup...';
+
+    EXEC dbo.lakeflowSetupChangeTracking
+    @Tables = 'activity.ResourceActivity,resources.VersionStatus,resources.ResourceType,activity.ScormActivity,activity.ActivityStatus,activity.ScormActivityInteraction,activity.ScormActivityInteractionCorrectResponse,resources.VideoResourceVersion,hierarchy.CatalogueNodeVersionProvider,resources.ResourceVersionKeyword,hierarchy.CatalogueNodeVersion,activity.MediaResourceActivity,resources.ResourceVersionAuthor,resources.ResourceVersionEvent,hub.UserProvider,resources.ResourceAccessibility,hierarchy.NodePath,resources.ResourceVersionRating,resources.ResourceVersionEventType,hierarchy.NodeType,hub.User,hierarchy.NodePathNode,hierarchy.VersionStatus,hub.UserProfile,hierarchy.NodeVersion,hierarchy.Publication,hub.Attribute,hierarchy.NodeResource,hierarchy.NodeLink,resources.Resource,hub.RoleUserGroup,hierarchy.CatalogueNodeVersionKeyword,hub.UserGroup,hub.UserUserGroup,resources.WebLinkResourceVersion,resources.ResourceReference,hierarchy.FolderNodeVersion,hub.Role,hub.AttributeType,activity.AssessmentResourceActivity,hub.Scope,resources.AssessmentResourceVersion,hub.UserGroupAttribute,hierarchy.Node,resources.ResourceVersion',
+    @User = 'Elfhadmin',
+    @Retention = '7 DAYS';
+END
+ELSE
+BEGIN
+    PRINT 'Change Tracking is NOT enabled on this database. Skipping execution.';
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-7116-mib_new_env.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-7116-mib_new_env.sql
new file mode 100644
index 000000000..09e405b1d
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-7116-mib_new_env.sql
@@ -0,0 +1,8 @@
+ 
+IF NOT EXISTS(SELECT 'X' FROM [dbo].[MoodleInstanceConfigs] WHERE ShortName = 'moodle-prod')
+BEGIN
+	INSERT INTO [dbo].[MoodleInstanceConfigs] 
+	  (ShortName, BaseUrl, TokenSecretName, EnabledEndpoints, Weighting, IsEnabled, CreatedAt, UpdatedAt)
+	VALUES 
+	  ('moodle-prod', 'https://learn.learninghub.nhs.uk/', 'LearningHubMoodleClientSecretProd', 'users,courses,grades', 100, 1, GETUTCDATE(), GETUTCDATE());
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql
index 52e090048..684201612 100644
--- a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql
@@ -18,3 +18,4 @@ BEGIN
     RAISERROR (N'TD-2902 Add resource types to Content Server.sql must be run manually before release.', 16, 127) WITH NOWAIT
 END
 GO
+:r .\Scripts\ActivateChangeTracking.sql
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/ActivateChangeTracking.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/ActivateChangeTracking.sql
new file mode 100644
index 000000000..7e14ea5bd
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/ActivateChangeTracking.sql
@@ -0,0 +1,10 @@
+IF NOT EXISTS (
+    SELECT 1
+    FROM sys.change_tracking_databases
+    WHERE database_id = DB_ID()
+)
+BEGIN
+    ALTER DATABASE CURRENT
+    SET CHANGE_TRACKING = ON
+    (CHANGE_RETENTION = 2 DAYS, AUTO_CLEANUP = ON);
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueNodeVersionCategoryCreate.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueNodeVersionCategoryCreate.sql
index cd0fa408f..9818d8f75 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueNodeVersionCategoryCreate.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueNodeVersionCategoryCreate.sql	
@@ -6,12 +6,14 @@
 -- Modification History
 --
 -- 14-10-2025  SA	Initial Revision.
+-- 11-03-2026  SA   Added instance name
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [hierarchy].[CatalogueNodeVersionCategoryCreate]
 (
 	@userId INT, 
 	@CatalogueNodeVersionId INT,
-	@CategoryId INT,
+	@categoryId INT,
+	@instanceName VARCHAR(50),
 	@UserTimezoneOffset int = NULL
 )
 
@@ -33,19 +35,21 @@ BEGIN
 	END
 
 	INSERT INTO [hierarchy].[CatalogueNodeVersionCategory]
-           ([CatalogueNodeVersionId]
-           ,[CategoryId]
-           ,[Deleted]
-           ,[CreateUserId]
-           ,[CreateDate]
-           ,[AmendUserId]
-           ,[AmendDate])
-     VALUES
-           (@CatalogueNodeVersionId
-           ,@CategoryId
-           ,0
-           ,@userId
-           ,@AmendDate
-           ,@userId
-           ,@AmendDate)
+       ([CatalogueNodeVersionId]
+       ,[CategoryId]
+	   ,[InstanceName]
+       ,[Deleted]
+       ,[CreateUserId]
+       ,[CreateDate]
+       ,[AmendUserId]
+       ,[AmendDate])
+ VALUES
+       (@CatalogueNodeVersionId
+       ,@categoryId
+	   ,@instanceName
+       ,0
+       ,@userId
+       ,@AmendDate
+       ,@userId
+       ,@AmendDate)
 END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersionCategory.sql b/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersionCategory.sql
index c3ddc4832..b5c9f3f15 100644
--- a/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersionCategory.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersionCategory.sql
@@ -2,6 +2,7 @@
 	[Id] [int] IDENTITY(1,1) NOT NULL,
 	[CatalogueNodeVersionId] [int] NOT NULL,
 	[CategoryId] [int] NOT NULL,
+	[InstanceName] [varchar](50) NULL,
 	[Deleted] [bit] NOT NULL,
 	[CreateUserId] [int] NOT NULL,
 	[CreateDate] [datetimeoffset](7) NOT NULL,
diff --git a/WebAPI/LearningHub.Nhs.Database/Tables/MIB/MoodleInstanceConfigs.sql b/WebAPI/LearningHub.Nhs.Database/Tables/MIB/MoodleInstanceConfigs.sql
new file mode 100644
index 000000000..956319c6b
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Tables/MIB/MoodleInstanceConfigs.sql
@@ -0,0 +1,28 @@
+CREATE TABLE [dbo].[MoodleInstanceConfigs](
+	[Id] [int] IDENTITY(1,1) NOT NULL,
+	[BaseUrl] [nvarchar](500) NOT NULL,
+	[ShortName] [nvarchar](100) NOT NULL,
+	[TokenSecretName] [nvarchar](200) NOT NULL,
+	[EnabledEndpoints] [nvarchar](1000) NULL,
+	[IsEnabled] [bit] NOT NULL,
+	[Weighting] [int] NOT NULL,
+	[CreatedAt] [datetime2](7) NOT NULL,
+	[UpdatedAt] [datetime2](7) NOT NULL,
+ CONSTRAINT [PK_InstanceConfigs] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[MoodleInstanceConfigs] ADD  CONSTRAINT [DF_InstanceConfigs_IsEnabled]  DEFAULT ((1)) FOR [IsEnabled]
+GO
+
+ALTER TABLE [dbo].[MoodleInstanceConfigs] ADD  CONSTRAINT [DF_InstanceConfigs_Weighting]  DEFAULT ((100)) FOR [Weighting]
+GO
+
+ALTER TABLE [dbo].[MoodleInstanceConfigs] ADD  CONSTRAINT [DF_InstanceConfigs_CreatedAt]  DEFAULT (sysutcdatetime()) FOR [CreatedAt]
+GO
+
+ALTER TABLE [dbo].[MoodleInstanceConfigs] ADD  CONSTRAINT [DF_InstanceConfigs_UpdatedAt]  DEFAULT (sysutcdatetime()) FOR [UpdatedAt]
+GO
\ No newline at end of file
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 5d12c4600..0ff751617 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -10,7 +10,7 @@
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
    <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 b7cca29dc..b206c9818 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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/IFindWiseHttpClient.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IFindWiseHttpClient.cs
deleted file mode 100644
index 74cc6f31f..000000000
--- a/WebAPI/LearningHub.Nhs.Services.Interface/IFindWiseHttpClient.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace LearningHub.Nhs.Services.Interface
-{
-    using System.Net.Http;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// The FindWise Http Client interface.
-    /// </summary>
-    public interface IFindWiseHttpClient
-    {
-        /// <summary>
-        /// The get cient async.
-        /// </summary>
-        /// <param name="httpClientUrl">The url of the client.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        Task<HttpClient> GetClient(string httpClientUrl);
-    }
-}
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IFindwiseApiFacade.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IFindwiseApiFacade.cs
deleted file mode 100644
index 4e50ff92b..000000000
--- a/WebAPI/LearningHub.Nhs.Services.Interface/IFindwiseApiFacade.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace LearningHub.Nhs.Services.Interface
-{
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-    using LearningHub.Nhs.Models.Search;
-
-    /// <summary>
-    /// The IFindwiseApiFacade.
-    /// </summary>
-    public interface IFindwiseApiFacade
-    {
-        /// <summary>
-        /// Modifies the information Findwise has for the catalogues provided.
-        /// Documents not in Findwise will be added.
-        /// Documents that already exist in Findwise will be replaced.
-        /// </summary>
-        /// <param name="catalogues">The catalogues to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        Task AddOrReplaceAsync(List<SearchCatalogueRequestModel> catalogues);
-
-        /// <summary>
-        /// Modifies the information Findwise has for the resources provided.
-        /// Documents not in Findwise will be added.
-        /// Documents that already exist in Findwise will be replaced.
-        /// </summary>
-        /// <param name="resources">The resources to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        Task AddOrReplaceAsync(List<SearchResourceRequestModel> resources);
-
-        /// <summary>
-        /// Removes the documents from Findwise.
-        /// </summary>
-        /// <param name="resources">The resources to remove from Findwise.</param>
-        /// <returns>The task.</returns>
-        Task RemoveAsync(List<SearchResourceRequestModel> resources);
-    }
-}
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
index 9b2e8e9d4..b31374b16 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
@@ -165,7 +165,7 @@ public interface IResourceService
         Task<int> PublishResourceVersionAsync(PublishViewModel publishViewModel);
 
         /// <summary>
-        /// Submits a published resource version to the Findwise search.
+        /// Submits a published resource version to search.
         /// </summary>
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
         /// <param name="userId">The userId<see cref="int"/>.</param>
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 6ee630341..31ce5eb56 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -16,7 +16,7 @@
 		<PackageReference Include="Azure.Storage.Queues" Version="12.21.0" />
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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/CatalogueServiceTests.cs b/WebAPI/LearningHub.Nhs.Services.UnitTests/CatalogueServiceTests.cs
index 4157f98cb..f7f49ec59 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/CatalogueServiceTests.cs
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/CatalogueServiceTests.cs
@@ -28,7 +28,6 @@ public class CatalogueServiceTests : TestBase
     {
         private readonly Mock<IUserRepository> mockUserRepository;
         private readonly Mock<IResourceVersionRepository> mockResourceVersionRepository;
-        private readonly Mock<IFindwiseApiFacade> mockFindwiseApiFacade;
         private Mock<IRoleUserGroupRepository> mockRoleUserGroupRepository;
         private Mock<IUserUserGroupRepository> mockUserUserGroupRepository;
         private MockRepository mockRepository;
@@ -62,7 +61,6 @@ public CatalogueServiceTests()
             this.mockRoleUserGroupRepository = this.mockRepository.Create<IRoleUserGroupRepository>();
             this.mockUserRepository = this.mockRepository.Create<IUserRepository>();
             this.mockResourceVersionRepository = this.mockRepository.Create<IResourceVersionRepository>();
-            this.mockFindwiseApiFacade = this.mockRepository.Create<IFindwiseApiFacade>();
             this.mockRoleUserGroupRepository = this.mockRepository.Create<IRoleUserGroupRepository>();
             this.mockUserUserGroupRepository = this.mockRepository.Create<IUserUserGroupRepository>();
             this.mockEmailSenderService = this.mockRepository.Create<IEmailSenderService>();
@@ -142,7 +140,6 @@ private CatalogueService CreateService()
                 this.mockUserRepository.Object,
                 this.mockRoleUserGroupRepository.Object,
                 this.mockResourceVersionRepository.Object,
-                this.mockFindwiseApiFacade.Object,
                 this.mockUserUserGroupRepository.Object,
                 this.mockEmailSenderService.Object,
                 ////this.mockUserService.Object,
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 dbb1f6a30..a91b6e0b0 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
 		<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="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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/BaseService.cs b/WebAPI/LearningHub.Nhs.Services/BaseService.cs
index 2d9ae36dc..6dc0b1779 100644
--- a/WebAPI/LearningHub.Nhs.Services/BaseService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/BaseService.cs
@@ -1,6 +1,5 @@
 namespace LearningHub.Nhs.Services
 {
-    using LearningHub.Nhs.Services.Interface;
     using Microsoft.Extensions.Logging;
 
     /// <summary>
@@ -16,20 +15,13 @@ public abstract class BaseService<T>
         /// </summary>
         private readonly ILogger logger;
 
-        /// <summary>
-        /// The Find Wise HTTP Client.
-        /// </summary>
-        private IFindWiseHttpClient findWiseHttpClient;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseService{T}"/> class.
         /// The  base service.
         /// </summary>
-        /// <param name="findWiseHttpClient">The Find Wise http client.</param>
         /// <param name="logger">The logger.</param>
-        protected BaseService(IFindWiseHttpClient findWiseHttpClient, ILogger<T> logger)
+        protected BaseService(ILogger<T> logger)
         {
-            this.findWiseHttpClient = findWiseHttpClient;
             this.logger = logger;
         }
 
@@ -40,13 +32,5 @@ protected ILogger Logger
         {
             get { return this.logger; }
         }
-
-        /// <summary>
-        /// Gets the Find Wise HTTP Client.
-        /// </summary>
-        protected IFindWiseHttpClient FindWiseHttpClient
-        {
-            get { return this.findWiseHttpClient; }
-        }
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
index c9906b62f..370c876c7 100644
--- a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
@@ -40,7 +40,6 @@ public class CatalogueService : ICatalogueService
         private readonly IUserRepository userRepository;
         private readonly IRoleUserGroupRepository roleUserGroupRepository;
         private readonly IResourceVersionRepository resourceVersionRepository;
-        private readonly IFindwiseApiFacade findwiseApiFacade;
         private readonly IUserUserGroupRepository userUserGroupRepository;
         private readonly IEmailSenderService emailSenderService;
         private readonly Settings settings;
@@ -90,7 +89,6 @@ public CatalogueService(
             IUserRepository userRepository,
             IRoleUserGroupRepository roleUserGroupRepository,
             IResourceVersionRepository resourceVersionRepository,
-            IFindwiseApiFacade findwiseApiFacade,
             IUserUserGroupRepository userUserGroupRepository,
             IEmailSenderService emailSenderService,
             ////elfhHub.Nhs.Services.Interface.IUserService userService,
@@ -108,7 +106,6 @@ public CatalogueService(
             this.catalogueNodeVersionRepository = catalogueNodeVersionRepository;
             this.nodeResourceRepository = nodeResourceRepository;
             this.resourceVersionRepository = resourceVersionRepository;
-            this.findwiseApiFacade = findwiseApiFacade;
             this.roleUserGroupRepository = roleUserGroupRepository;
             this.userUserGroupRepository = userUserGroupRepository;
             this.nodeActivityRepository = nodeActivityRepository;
@@ -250,24 +247,6 @@ public async Task<LearningHubValidationResult> CreateCatalogueAsync(int userId,
 
             var catalogueNodeVersionId = await this.catalogueNodeVersionRepository.CreateCatalogueAsync(userId, catalogue);
 
-            // Catalogue is in database, push to findwise
-            var cnv = this.catalogueNodeVersionRepository.GetAll()
-                .Include(x => x.NodeVersion).ThenInclude(x => x.Node)
-                .Include(x => x.Keywords)
-                .Include(x => x.CatalogueNodeVersionProvider)
-                .SingleOrDefault(x => x.Id == catalogueNodeVersionId);
-
-            if (cnv != null)
-            {
-                var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
-                if (searchModel.Description.Length > this.settings.Findwise.DescriptionLengthLimit)
-                {
-                    searchModel.Description = searchModel.Description.Substring(0, this.settings.Findwise.DescriptionLengthLimit - 4) + "</p>";
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
-            }
-
             return new LearningHubValidationResult(true)
             {
                 CreatedId = catalogueNodeVersionId,
@@ -486,24 +465,6 @@ public async Task<LearningHubValidationResult> UpdateCatalogueAsync(int userId,
 
             await this.catalogueNodeVersionRepository.UpdateCatalogueAsync(userId, catalogue);
 
-            // Update catalogue in findwise
-            var cnv = this.catalogueNodeVersionRepository.GetAll()
-                .Include(x => x.NodeVersion).ThenInclude(x => x.Node)
-                .Include(x => x.Keywords)
-                .Include(x => x.CatalogueNodeVersionProvider)
-                .SingleOrDefault(x => x.Id == catalogue.CatalogueNodeVersionId);
-
-            if (cnv != null)
-            {
-                var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
-                if (searchModel.Description.Length > this.settings.Findwise.DescriptionLengthLimit)
-                {
-                    searchModel.Description = searchModel.Description.Substring(0, this.settings.Findwise.DescriptionLengthLimit - 4) + "</p>";
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
-            }
-
             return new LearningHubValidationResult(true);
         }
 
@@ -579,24 +540,6 @@ public async Task<LearningHubValidationResult> ShowCatalogueAsync(int userId, in
 
             await this.catalogueNodeVersionRepository.ShowCatalogue(userId, nodeId);
 
-            var cnv = this.catalogueNodeVersionRepository.GetAll()
-                    .Include(x => x.NodeVersion).ThenInclude(x => x.Node)
-                    .Include(x => x.Keywords)
-                    .Include(x => x.CatalogueNodeVersionProvider)
-                    .SingleOrDefault(x => x.NodeVersion.NodeId == nodeId);
-
-            // update findwise
-            if (cnv != null)
-            {
-                var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
-                if (searchModel.Description.Length > this.settings.Findwise.DescriptionLengthLimit)
-                {
-                    searchModel.Description = searchModel.Description.Substring(0, this.settings.Findwise.DescriptionLengthLimit - 4) + "</p>";
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
-            }
-
             return new LearningHubValidationResult(true);
         }
 
@@ -615,24 +558,7 @@ public async Task HideCatalogueAsync(int userId, int nodeId)
             }
 
             node.Hidden = true;
-            await this.nodeRepository.UpdateAsync(userId, node);
-
-            // update findwise
-            var cnv = this.catalogueNodeVersionRepository.GetAll()
-                    .Include(x => x.NodeVersion).ThenInclude(x => x.Node)
-                    .Include(x => x.Keywords)
-                    .Include(x => x.CatalogueNodeVersionProvider)
-                    .SingleOrDefault(x => x.NodeVersion.NodeId == nodeId);
-            if (cnv != null)
-            {
-                var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
-                if (searchModel.Description.Length > this.settings.Findwise.DescriptionLengthLimit)
-                {
-                    searchModel.Description = searchModel.Description.Substring(0, this.settings.Findwise.DescriptionLengthLimit - 4) + "</p>";
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
-            }
+            await this.nodeRepository.UpdateAsync(userId, node);           
         }
 
         /// <summary>
diff --git a/WebAPI/LearningHub.Nhs.Services/FindWiseHttpClient.cs b/WebAPI/LearningHub.Nhs.Services/FindWiseHttpClient.cs
deleted file mode 100644
index 51a2fa0cb..000000000
--- a/WebAPI/LearningHub.Nhs.Services/FindWiseHttpClient.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-namespace LearningHub.Nhs.Services
-{
-    using System;
-    using System.Net.Http;
-    using System.Net.Http.Headers;
-    using System.Threading.Tasks;
-    using LearningHub.Nhs.Services.Interface;
-
-    /// <summary>
-    /// The FindWise Http Client.
-    /// </summary>
-    public class FindWiseHttpClient : IFindWiseHttpClient, IDisposable
-    {
-        private readonly HttpClient httpClient = new ();
-        //// private readonly LearningHubAuthServiceConfig authConfig;
-        private bool initialised = false;
-
-        /// <summary>
-        /// The Get Client method.
-        /// </summary>
-        /// <param name="httpClientUrl">The url of the client.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<HttpClient> GetClient(string httpClientUrl)
-        {
-            this.Initialise(httpClientUrl);
-            return this.httpClient;
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// The dispoase.
-        /// </summary>
-        /// <param name="disposing">disposing.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                this.httpClient.Dispose();
-            }
-        }
-
-        private void Initialise(string httpClientUrl)
-        {
-            if (this.initialised == false)
-            {
-                this.httpClient.BaseAddress = new Uri(httpClientUrl);
-                this.httpClient.DefaultRequestHeaders.Accept.Clear();
-                this.httpClient.DefaultRequestHeaders.Accept.Add(
-                    new MediaTypeWithQualityHeaderValue("application/json"));
-                this.initialised = true;
-            }
-        }
-    }
-}
diff --git a/WebAPI/LearningHub.Nhs.Services/Findwise/FindwiseApiFacade.cs b/WebAPI/LearningHub.Nhs.Services/Findwise/FindwiseApiFacade.cs
deleted file mode 100644
index 06911ba10..000000000
--- a/WebAPI/LearningHub.Nhs.Services/Findwise/FindwiseApiFacade.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-namespace LearningHub.Nhs.Services.Findwise
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net.Http;
-    using System.Text;
-    using System.Threading.Tasks;
-    using LearningHub.Nhs.Api.Shared.Configuration;
-    using LearningHub.Nhs.Models.Search;
-    using LearningHub.Nhs.Services.Interface;
-    using Microsoft.Extensions.Logging;
-    using Microsoft.Extensions.Options;
-    using Newtonsoft.Json;
-
-    /// <summary>
-    /// The FindwiseApiFacade.
-    /// </summary>
-    public class FindwiseApiFacade : IFindwiseApiFacade
-    {
-        private readonly IFindWiseHttpClient findWiseHttpClient;
-        private readonly Settings settings;
-        private readonly ILogger<FindwiseApiFacade> logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FindwiseApiFacade"/> class.
-        /// </summary>
-        /// <param name="findWiseHttpClient">The findWiseHttpClient.</param>
-        /// <param name="options">The options.</param>
-        /// <param name="logger">The logger.</param>
-        public FindwiseApiFacade(
-            IFindWiseHttpClient findWiseHttpClient,
-            IOptions<Settings> options,
-            ILogger<FindwiseApiFacade> logger)
-        {
-            this.findWiseHttpClient = findWiseHttpClient;
-            this.settings = options.Value;
-            this.logger = logger;
-        }
-
-        /// <summary>
-        /// Modifies the information Findwise has for the catalogues provided.
-        /// Documents not in Findwise will be added.
-        /// Documents that already exist in Findwise will be replaced.
-        /// </summary>
-        /// <param name="catalogues">The catalogues to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        public async Task AddOrReplaceAsync(List<SearchCatalogueRequestModel> catalogues)
-        {
-            var request = string.Format(this.settings.Findwise.IndexMethod, this.settings.Findwise.CollectionIds.Catalogue)
-                + $"?token={this.settings.Findwise.Token}";
-            var response = await this.PostAsync(request, catalogues);
-            this.ValidateResponse(response, $"catalogues: {string.Join(',', catalogues.Select(x => x.Id))}");
-        }
-
-        /// <summary>
-        /// Modifies the information Findwise has for the resources provided.
-        /// Documents not in Findwise will be added.
-        /// Documents that already exist in Findwise will be replaced.
-        /// </summary>
-        /// <param name="resources">The resources to add/replace in the index.</param>
-        /// <returns>The task.</returns>
-        public async Task AddOrReplaceAsync(List<SearchResourceRequestModel> resources)
-        {
-            var request = string.Format(this.settings.Findwise.IndexMethod, this.settings.Findwise.CollectionIds.Resource)
-                + $"?token={this.settings.Findwise.Token}";
-            var response = await this.PostAsync(request, resources);
-            this.ValidateResponse(response, $"resources: {string.Join(',', resources.Select(x => x.Id))}");
-        }
-
-        /// <summary>
-        /// Removes the documents from Findwise.
-        /// </summary>
-        /// <param name="resources">The resources to remove from Findwise.</param>
-        /// <returns>The task.</returns>
-        public async Task RemoveAsync(List<SearchResourceRequestModel> resources)
-        {
-            var resourceIds = resources.Select(x => x.Id);
-            var idQueryString = string.Join(
-                '&',
-                resourceIds.Select(x => $"id={x}"));
-            var request = string.Format(
-                this.settings.Findwise.IndexMethod,
-                this.settings.Findwise.CollectionIds.Resource)
-                + $"?{idQueryString}&token={this.settings.Findwise.Token}";
-            var response = await this.DeleteAsync(request);
-            this.ValidateResponse(response, $"resources: {string.Join(',', resourceIds)}");
-        }
-
-        private void ValidateResponse(HttpResponseMessage response, string dataForError)
-        {
-            if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-            {
-                this.logger.LogError($"Updating FindWise failed for {dataForError}  HTTP Status Code:" + response.StatusCode.ToString());
-                throw new Exception("AccessDenied");
-            }
-            else if (!response.IsSuccessStatusCode)
-            {
-                this.logger.LogError($"Updating FindWise failed for {dataForError}  HTTP Status Code:" + response.StatusCode.ToString());
-                throw new Exception("Posting of resource to search failed: " + dataForError);
-            }
-        }
-
-        private async Task<HttpResponseMessage> PostAsync<T>(string request, T obj)
-            where T : class, new()
-        {
-            var content = this.GetContent(obj);
-            var client = await this.GetClientAsync();
-            return await client.PostAsync(request, content).ConfigureAwait(false);
-        }
-
-        private async Task<HttpResponseMessage> DeleteAsync(string request)
-        {
-            var client = await this.GetClientAsync();
-            return await client.DeleteAsync(request).ConfigureAwait(false);
-        }
-
-        private async Task<HttpClient> GetClientAsync()
-        {
-            return await this.findWiseHttpClient.GetClient(this.settings.Findwise.IndexUrl);
-        }
-
-        private StringContent GetContent<T>(T obj)
-            where T : class, new()
-        {
-            var json = JsonConvert.SerializeObject(obj, new JsonSerializerSettings() { DateFormatString = "yyyy-MM-dd" });
-
-            return new StringContent(json, UnicodeEncoding.UTF8, "application/json");
-        }
-    }
-}
diff --git a/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs b/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
index 5a2d6734d..4df4915a2 100644
--- a/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
@@ -651,7 +651,7 @@ public async Task<int> PublishHierarchyEditAsync(PublishHierarchyEditViewModel p
             var currentUserId = publishViewModel.UserId;
             var publicationId = this.hierarchyEditRepository.Publish(publishViewModel.HierarchyEditId, publishViewModel.IsMajorRevision, publishViewModel.Notes, currentUserId);
 
-            bool success = true; // From Findwise in IT2
+            bool success = true;
 
             if (success)
             {
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index 98cec165a..c44ed1fde 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,7 @@
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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/LearningHub.Nhs.Services/Messaging/MessageService.cs b/WebAPI/LearningHub.Nhs.Services/Messaging/MessageService.cs
index fa28f33b1..98a8d2610 100644
--- a/WebAPI/LearningHub.Nhs.Services/Messaging/MessageService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/Messaging/MessageService.cs
@@ -9,7 +9,6 @@
     using LearningHub.Nhs.Models.Messaging;
     using LearningHub.Nhs.Models.Validation;
     using LearningHub.Nhs.Repository.Interface.Messaging;
-    using LearningHub.Nhs.Services.Interface;
     using LearningHub.Nhs.Services.Interface.Messaging;
     using Microsoft.Extensions.Logging;
 
@@ -23,14 +22,12 @@ public class MessageService : BaseService<Message>, IMessageService
         /// <summary>
         /// Initializes a new instance of the <see cref="MessageService"/> class.
         /// </summary>
-        /// <param name="findwiseHttpClient">The findwiseHttpClient.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="messageRepository">The message repository.</param>
         public MessageService(
-            IFindWiseHttpClient findwiseHttpClient,
             ILogger<Message> logger,
             IMessageRepository messageRepository)
-            : base(findwiseHttpClient, logger)
+            : base(logger)
         {
             this.messageRepository = messageRepository;
         }
diff --git a/WebAPI/LearningHub.Nhs.Services/NotificationTemplateService.cs b/WebAPI/LearningHub.Nhs.Services/NotificationTemplateService.cs
index 8452f03b5..d1934b338 100644
--- a/WebAPI/LearningHub.Nhs.Services/NotificationTemplateService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/NotificationTemplateService.cs
@@ -20,14 +20,12 @@ public class NotificationTemplateService : BaseService<NotificationTemplate>, IN
         /// <summary>
         /// Initializes a new instance of the <see cref="NotificationTemplateService"/> class.
         /// </summary>
-        /// <param name="fwClient">The findwise client.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="notificationTemplateRepository">The notification template repository.</param>
         public NotificationTemplateService(
-            IFindWiseHttpClient fwClient,
             ILogger<NotificationTemplate> logger,
             INotificationTemplateRepository notificationTemplateRepository)
-            : base(fwClient, logger)
+            : base(logger)
         {
             this.notificationTemplateRepository = notificationTemplateRepository;
         }
diff --git a/WebAPI/LearningHub.Nhs.Services/RatingService.cs b/WebAPI/LearningHub.Nhs.Services/RatingService.cs
index ead13ade2..23c96c4fa 100644
--- a/WebAPI/LearningHub.Nhs.Services/RatingService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/RatingService.cs
@@ -232,7 +232,6 @@ public async Task<LearningHubValidationResult> CreateRating(int userId, RatingVi
 
             await this.GetRatingSummaryBasic(ratingViewModel.EntityVersionId);
 
-            // TODO: Submit new resource record to findwise.
             return retVal;
         }
 
@@ -333,7 +332,6 @@ private async Task CreateNewRatingAndRecalcAverageAsync(int userId, RatingViewMo
 
             await this.resourceVersionRatingSummaryRepository.UpdateAsync(userId, ratingSummary);
 
-            // Submit updated rating to Findwise.
             await this.resourceService.SubmitResourceVersionToSearchAsync(ratingViewModel.EntityVersionId, userId);
         }
 
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index 6d71a5194..30278bad6 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -984,7 +984,7 @@ public async Task<int> PublishResourceVersionAsync(PublishViewModel publishViewM
         }
 
         /// <summary>
-        /// Submits a published resource version to the Findwise search.
+        /// Submits a published resource version to search.
         /// </summary>
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
         /// <param name="userId">The userId<see cref="int"/>.</param>
@@ -1236,7 +1236,7 @@ public async Task<LearningHubValidationResult> UnpublishResourceVersion(Unpublis
 
                 this.resourceVersionRepository.Unpublish(unpublishViewModel.ResourceVersionId, unpublishViewModel.Details, userId);
 
-                // Remove from Findwise Search Index
+                // Remove from Search Index
                 var r = await this.resourceVersionRepository.GetBasicByIdAsync(unpublishViewModel.ResourceVersionId);
                 await this.searchService.RemoveResourceFromSearchAsync(r.ResourceId);
 
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceSyncService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceSyncService.cs
index 9c24ff569..9373ad6c8 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceSyncService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceSyncService.cs
@@ -24,7 +24,6 @@ public class ResourceSyncService : IResourceSyncService
         private readonly IResourceVersionRepository resourceVersionRepository;
         private readonly ICatalogueNodeVersionRepository catalogueNodeVersionRepository;
         private readonly IGenericFileResourceVersionRepository genericFileResourceVersionRepository;
-        private readonly IFindwiseApiFacade findwiseApiFacade;
         private readonly IMapper mapper;
 
         /// <summary>
@@ -34,21 +33,18 @@ public class ResourceSyncService : IResourceSyncService
         /// <param name="resourceVersionRepository">The resourceVersionRepository.</param>
         /// <param name="catalogueNodeVersionRepository">The catalogueNodeVersionRepository.</param>
         /// <param name="genericFileResourceVersionRepository">The genericFileResourceVersionRepository.</param>
-        /// <param name="findwiseApiFacade">The findwiseApiFacade.</param>
         /// <param name="mapper">The mapper.</param>
         public ResourceSyncService(
             IResourceSyncRepository resourceSyncRepository,
             IResourceVersionRepository resourceVersionRepository,
             ICatalogueNodeVersionRepository catalogueNodeVersionRepository,
             IGenericFileResourceVersionRepository genericFileResourceVersionRepository,
-            IFindwiseApiFacade findwiseApiFacade,
             IMapper mapper)
         {
             this.resourceSyncRepository = resourceSyncRepository;
             this.resourceVersionRepository = resourceVersionRepository;
             this.catalogueNodeVersionRepository = catalogueNodeVersionRepository;
             this.genericFileResourceVersionRepository = genericFileResourceVersionRepository;
-            this.findwiseApiFacade = findwiseApiFacade;
             this.mapper = mapper;
         }
 
@@ -104,46 +100,6 @@ public List<ResourceAdminSearchResultViewModel> GetSyncListResourcesForUser(int
         /// <returns>The task.</returns>
         public async Task<LearningHubValidationResult> SyncForUserAsync(int userId)
         {
-            // Obtain Resource Version dataset related to the sync list for the supplied User Id.
-            var syncList = this.resourceSyncRepository.GetSyncListForUser(userId, true).ToList();
-
-            var resources = syncList.Select(x => x.Resource).ToList();
-
-            // Sync Updates
-            var resourcesToUpdate = resources.Where(x => !this.ResourceIsUnpublished(x)).ToList();
-            var resourceVersionIdList = resourcesToUpdate.Select(x => x.Id).ToList();
-            var mappedResourcesToUpdate = await this.BuildSearchResourceRequestModelList(resourceVersionIdList);
-
-            // Validate Findwise submission
-            var invalidResourceDetails = new List<string>();
-            foreach (var r in mappedResourcesToUpdate)
-            {
-                if (!r.IsValidForSubmission())
-                {
-                    invalidResourceDetails.Add(r.Title);
-                }
-            }
-
-            if (invalidResourceDetails.Count > 0)
-            {
-                return new LearningHubValidationResult(false, $"The following Resources are not valid for submission: {string.Join(", ", invalidResourceDetails)}");
-            }
-
-            // Send update to Findwise
-            if (mappedResourcesToUpdate.Any())
-            {
-                await this.findwiseApiFacade.AddOrReplaceAsync(mappedResourcesToUpdate.ToList());
-            }
-
-            // Synce Deletes
-            var resourcesToDelete = resources.Where(x => this.ResourceIsUnpublished(x)).ToList();
-            var mappedResourcesToDelete = resourcesToDelete.Select(x => this.mapper.Map<SearchResourceRequestModel>(x)).ToList();
-
-            if (mappedResourcesToDelete.Any())
-            {
-                await this.findwiseApiFacade.RemoveAsync(mappedResourcesToDelete.ToList());
-            }
-
             await this.resourceSyncRepository.SetSyncedForUserAsync(userId);
 
             return new LearningHubValidationResult(true);
@@ -247,22 +203,7 @@ public async Task<LearningHubValidationResult> SyncSingleAsync(int resourceVersi
             if (resourceVersion == null)
             {
                 throw new Exception($"No resource version found for id '{resourceVersionId}'");
-            }
-
-            var searchResourceRequestModel = await this.BuildSearchResourceRequestModel(resourceVersionId);
-            if (this.ResourceIsUnpublished(resourceVersion))
-            {
-                await this.findwiseApiFacade.RemoveAsync(new List<SearchResourceRequestModel> { searchResourceRequestModel });
-            }
-            else
-            {
-                if (!searchResourceRequestModel.IsValidForSubmission())
-                {
-                    return new LearningHubValidationResult(false, $"Resource '{resourceVersion.Title}' is not valid for submission to Findwise");
-                }
-
-                await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchResourceRequestModel> { searchResourceRequestModel });
-            }
+            }          
 
             return new LearningHubValidationResult(true);
         }
diff --git a/WebAPI/LearningHub.Nhs.Services/SearchService.cs b/WebAPI/LearningHub.Nhs.Services/SearchService.cs
index d05c73cb5..993448a3a 100644
--- a/WebAPI/LearningHub.Nhs.Services/SearchService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/SearchService.cs
@@ -42,18 +42,16 @@ public class SearchService : BaseService<SearchService>, ISearchService
         /// Initializes a new instance of the <see cref="SearchService"/> class.
         /// The search service.
         /// </summary>
-        /// <param name="findWiseHttpClient">The FindWise Http Client.</param>
         /// <param name="eventService">The event service.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="settings">The settings.</param>
         /// <param name="mapper">The mapper.</param>
         public SearchService(
-            IFindWiseHttpClient findWiseHttpClient,
             IEventService eventService,
             ILogger<SearchService> logger,
             IOptions<Settings> settings,
             IMapper mapper)
-        : base(findWiseHttpClient, logger)
+        : base(logger)
         {
             this.eventService = eventService;
             this.settings = settings.Value;
@@ -68,69 +66,8 @@ public SearchService(
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<SearchResultModel> GetSearchResultAsync(SearchRequestModel searchRequestModel, int userId)
         {
-            SearchResultModel viewmodel = new SearchResultModel();
-
-            try
-            {
-                // e.g. if pagesize is 10, then offset would be 0,10,20,30
-                var pageSize = searchRequestModel.PageSize;
-                var offset = searchRequestModel.PageIndex * pageSize;
-
-                var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.SearchUrl);
-                var request = string.Format(
-                    this.settings.Findwise.UrlSearchComponent + "?offset={1}&hits={2}&q={3}&token={4}",
-                    this.settings.Findwise.CollectionIds.Resource,
-                    offset,
-                    pageSize,
-                    this.EncodeSearchText(searchRequestModel.SearchText) + searchRequestModel.FilterText + searchRequestModel.ResourceAccessLevelFilterText + searchRequestModel.ProviderFilterText,
-                    this.settings.Findwise.Token);
-
-                if (searchRequestModel.CatalogueId.HasValue)
-                {
-                    request += $"&catalogue_ids={searchRequestModel.CatalogueId}";
-                }
-
-                // if sort column is requested
-                if (!string.IsNullOrEmpty(searchRequestModel.SortColumn))
-                {
-                    var sortquery = $"&sort={searchRequestModel.SortColumn}";
-
-                    // if sort direction option is requested
-                    if (!string.IsNullOrEmpty(searchRequestModel.SortDirection))
-                    {
-                        var sortdirection = searchRequestModel.SortDirection.StartsWith("asc") ? "asc" : "desc";
-                        sortquery = $"{sortquery}_{sortdirection}";
-                    }
-
-                    request = $"{request}{sortquery}";
-                }
-
-                var response = await client.GetAsync(request).ConfigureAwait(false);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    var result = response.Content.ReadAsStringAsync().Result;
-                    viewmodel = JsonConvert.DeserializeObject<SearchResultModel>(result);
-                    searchRequestModel.TotalNumberOfHits = viewmodel.Stats.TotalHits;
-                }
-                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                {
-                    this.Logger.LogError($"Get Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}");
-                    throw new Exception("AccessDenied to FindWise Server");
-                }
-                else
-                {
-                    var error = response.Content.ReadAsStringAsync().Result.ToString();
-                    this.Logger.LogError($"Get Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}, Error Message:{error}");
-                    throw new Exception("Error with FindWise Server");
-                }
-
-                return viewmodel;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
+            this.Logger.LogWarning("Search is not currently configured. Returning empty results.");
+            return await Task.FromResult(new SearchResultModel());
         }
 
         /// <summary>
@@ -147,53 +84,7 @@ public async Task<SearchResultModel> GetSearchResultAsync(SearchRequestModel sea
         /// </returns>
         public async Task<SearchCatalogueResultModel> GetCatalogueSearchResultAsync(CatalogueSearchRequestModel catalogSearchRequestModel, int userId)
         {
-            var viewmodel = new SearchCatalogueResultModel();
-
-            try
-            {
-                // e.g. if pagesize is 3, then offset would be 0,3,6,9
-                var offset = catalogSearchRequestModel.PageIndex * catalogSearchRequestModel.PageSize;
-                var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.SearchUrl);
-                var request = string.Format(
-                    this.settings.Findwise.UrlSearchComponent + "?offset={1}&hits={2}&q={3}&token={4}",
-                    this.settings.Findwise.CollectionIds.Catalogue,
-                    offset,
-                    catalogSearchRequestModel.PageSize,
-                    this.EncodeSearchText(catalogSearchRequestModel.SearchText),
-                    this.settings.Findwise.Token);
-
-                var response = await client.GetAsync(request).ConfigureAwait(false);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    var result = response.Content.ReadAsStringAsync().Result;
-                    viewmodel = JsonConvert.DeserializeObject<SearchCatalogueResultModel>(result);
-                    catalogSearchRequestModel.TotalNumberOfHits = viewmodel.Stats.TotalHits;
-                }
-                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                {
-                    this.Logger.LogError($"Get Catalogue Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}");
-                    throw new Exception("AccessDenied to FindWise Server");
-                }
-                else
-                {
-                    var error = response.Content.ReadAsStringAsync().Result.ToString();
-                    this.Logger.LogError($"Get Catalogue Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}, Error Message:{error}");
-                    throw new Exception("Error with FindWise Server");
-                }
-
-                var remainingItems = catalogSearchRequestModel.TotalNumberOfHits - offset;
-                var resultsPerPage = remainingItems >= catalogSearchRequestModel.PageSize ? catalogSearchRequestModel.PageSize : remainingItems;
-                LearningHubValidationResult validationResult = await this.CreateCatalogueSearchTerm(catalogSearchRequestModel, resultsPerPage, userId);
-
-                viewmodel.SearchId = validationResult.CreatedId ?? 0;
-
-                return viewmodel;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
+            return await Task.FromResult(new SearchCatalogueResultModel());
         }
 
         /// <summary>
@@ -205,53 +96,7 @@ public async Task<SearchCatalogueResultModel> GetCatalogueSearchResultAsync(Cata
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<bool> SendResourceForSearchAsync(SearchResourceRequestModel searchResourceRequestModel, int userId, int? iterations)
         {
-            try
-            {
-                if (string.IsNullOrEmpty(this.settings.Findwise.IndexMethod))
-                {
-                    this.Logger.LogWarning("The FindWiseIndexMethod is not configured. Resource not added to search results");
-                }
-                else
-                {
-                    List<SearchResourceRequestModel> resourceList = new List<SearchResourceRequestModel>();
-                    resourceList.Add(searchResourceRequestModel);
-
-                    var json = JsonConvert.SerializeObject(resourceList, new JsonSerializerSettings() { DateFormatString = "yyyy-MM-dd" });
-
-                    var stringContent = new StringContent(json, UnicodeEncoding.UTF8, "application/json");
-
-                    var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.IndexUrl);
-
-                    var request = string.Format(this.settings.Findwise.IndexMethod, this.settings.Findwise.CollectionIds.Resource) + $"?token={this.settings.Findwise.Token}";
-                    var response = await client.PostAsync(request, stringContent).ConfigureAwait(false);
-                    iterations--;
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                    {
-                        this.Logger.LogError("Save to FindWise failed for resourceId:" + searchResourceRequestModel.Id.ToString() + "HTTP Status Code:" + response.StatusCode.ToString());
-                        throw new Exception("AccessDenied");
-                    }
-                    else if (!response.IsSuccessStatusCode)
-                    {
-                        if (iterations < 0)
-                        {
-                            this.Logger.LogError("Save to FindWise failed for resourceId:" + searchResourceRequestModel.Id.ToString() + "HTTP Status Code:" + response.StatusCode.ToString());
-                            throw new Exception("Posting of resource to search failed: " + stringContent);
-                        }
-
-                        await this.SendResourceForSearchAsync(searchResourceRequestModel, userId, iterations);
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("Posting of resource to search failed: " + searchResourceRequestModel.Id + " : " + ex.Message);
-            }
+            return await Task.FromResult(true);
         }
 
         /// <summary>
@@ -443,36 +288,9 @@ public async Task<LearningHubValidationResult> CreateCatalogueResourceSearchActi
         /// </summary>
         /// <param name="resourceId">The resource to be removed from search.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task RemoveResourceFromSearchAsync(int resourceId)
+        public Task RemoveResourceFromSearchAsync(int resourceId)
         {
-            try
-            {
-                if (string.IsNullOrEmpty(this.settings.Findwise.IndexMethod))
-                {
-                    this.Logger.LogWarning("The FindWiseIndexMethod is not configured. Resource not removed from search.");
-                }
-                else
-                {
-                    var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.IndexUrl);
-
-                    var request = string.Format(this.settings.Findwise.IndexMethod, this.settings.Findwise.CollectionIds.Resource) + $"?id={resourceId.ToString()}&token={this.settings.Findwise.Token}";
-
-                    var response = await client.DeleteAsync(request).ConfigureAwait(false);
-
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                    {
-                        throw new Exception("AccessDenied");
-                    }
-                    else if (!response.IsSuccessStatusCode)
-                    {
-                        throw new Exception("Removal of resource to search failed: " + resourceId.ToString());
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("Removal of resource from search failed: " + resourceId.ToString() + " : " + ex.Message);
-            }
+            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -516,7 +334,7 @@ public async Task<bool> SendResourceSearchEventClickAsync(SearchActionResourceMo
             searchClickPayloadModel.TimeOfClick = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
             searchClickPayloadModel.SearchSignal.ProfileSignature.ApplicationId = ApplicationId;
             searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileType = ProfileType;
-            searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileId = this.settings.Findwise.CollectionIds.Resource;
+            searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileId = "Resource";
 
             return await this.SendSearchEventClickAsync(searchClickPayloadModel, true);
         }
@@ -536,7 +354,7 @@ public async Task<bool> SendCatalogueSearchEventAsync(SearchActionCatalogueModel
             searchClickPayloadModel.TimeOfClick = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
             searchClickPayloadModel.SearchSignal.ProfileSignature.ApplicationId = ApplicationId;
             searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileType = ProfileType;
-            searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileId = this.settings.Findwise.CollectionIds.Catalogue;
+            searchClickPayloadModel.SearchSignal.ProfileSignature.ProfileId = "Catalogue";
 
             return await this.SendSearchEventClickAsync(searchClickPayloadModel, false);
         }
@@ -548,44 +366,7 @@ public async Task<bool> SendCatalogueSearchEventAsync(SearchActionCatalogueModel
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<SearchAllCatalogueResultModel> GetAllCatalogueSearchResultsAsync(AllCatalogueSearchRequestModel catalogSearchRequestModel)
         {
-            var viewmodel = new SearchAllCatalogueResultModel();
-            try
-            {
-                var offset = catalogSearchRequestModel.PageIndex * catalogSearchRequestModel.PageSize;
-                var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.SearchUrl);
-                var request = string.Format(
-                    this.settings.Findwise.UrlSearchComponent + "?offset={1}&hits={2}&q={3}&token={4}",
-                    this.settings.Findwise.CollectionIds.Catalogue,
-                    offset,
-                    catalogSearchRequestModel.PageSize,
-                    this.EncodeSearchText(catalogSearchRequestModel.SearchText),
-                    this.settings.Findwise.Token);
-
-                var response = await client.GetAsync(request).ConfigureAwait(false);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    var result = response.Content.ReadAsStringAsync().Result;
-                    viewmodel = JsonConvert.DeserializeObject<SearchAllCatalogueResultModel>(result);
-                }
-                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                {
-                    this.Logger.LogError($"Get AllCatalogue Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}");
-                    throw new Exception("AccessDenied to FindWise Server");
-                }
-                else
-                {
-                    var error = response.Content.ReadAsStringAsync().Result.ToString();
-                    this.Logger.LogError($"Get AllCatalogue Search Result failed in FindWise, HTTP Status Code:{response.StatusCode}, Error Message:{error}");
-                    throw new Exception("Error with FindWise Server");
-                }
-
-                return viewmodel;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
+            return await Task.FromResult(new SearchAllCatalogueResultModel());
         }
 
         /// <summary>
@@ -595,42 +376,7 @@ public async Task<SearchAllCatalogueResultModel> GetAllCatalogueSearchResultsAsy
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term)
         {
-            var viewmodel = new AutoSuggestionModel();
-
-            try
-            {
-                var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.SearchUrl);
-                var request = string.Format(
-                    this.settings.Findwise.UrlSearchComponent + "?q={1}&token={2}",
-                    this.settings.Findwise.CollectionIds.AutoSuggestion,
-                    this.EncodeSearchText(term),
-                    this.settings.Findwise.Token);
-
-                var response = await client.GetAsync(request).ConfigureAwait(false);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    var result = response.Content.ReadAsStringAsync().Result;
-                    viewmodel = JsonConvert.DeserializeObject<AutoSuggestionModel>(result);
-                }
-                else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                {
-                    this.Logger.LogError($"Get Auto Suggetion Result failed in FindWise, HTTP Status Code:{response.StatusCode}");
-                    throw new Exception("AccessDenied to FindWise Server");
-                }
-                else
-                {
-                    var error = response.Content.ReadAsStringAsync().Result.ToString();
-                    this.Logger.LogError($"Get Auto Suggetion Result failed in FindWise, HTTP Status Code:{response.StatusCode}, Error Message:{error}");
-                    throw new Exception("Error with FindWise Server");
-                }
-
-                return viewmodel;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
+            return await Task.FromResult(new AutoSuggestionModel());
         }
 
         /// <summary>
@@ -647,7 +393,7 @@ public async Task<bool> SendAutoSuggestionEventAsync(AutoSuggestionClickPayloadM
             clickPayloadModel.TimeOfClick = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
             clickPayloadModel.SearchSignal.ProfileSignature.ApplicationId = ApplicationId;
             clickPayloadModel.SearchSignal.ProfileSignature.ProfileType = ProfileType;
-            clickPayloadModel.SearchSignal.ProfileSignature.ProfileId = this.settings.Findwise.CollectionIds.AutoSuggestion;
+            clickPayloadModel.SearchSignal.ProfileSignature.ProfileId = "AutoSuggestion";
 
             return await this.SendAutoSuggestionEventClickAsync(clickPayloadModel);
         }
@@ -662,46 +408,7 @@ public async Task<bool> SendAutoSuggestionEventAsync(AutoSuggestionClickPayloadM
         /// </returns>
         private async Task<bool> SendSearchEventClickAsync(SearchClickPayloadModel searchClickPayloadModel, bool isResource)
         {
-            var eventType = isResource ? "resource" : "catalog";
-
-            try
-            {
-                if (string.IsNullOrEmpty(this.settings.Findwise.UrlClickComponent))
-                {
-                    this.Logger.LogWarning($"The UrlClickComponent is not configured. {eventType} click event not send to FindWise.");
-                }
-                else
-                {
-                    var json = JsonConvert.SerializeObject(searchClickPayloadModel);
-                    var base64EncodedString = BinaryFormatterHelper.Base64EncodeObject(json);
-
-                    var request = $"{this.settings.Findwise.UrlClickComponent}?payload={base64EncodedString}";
-
-                    var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.SearchUrl);
-                    var response = await client.PostAsync(request, null).ConfigureAwait(false);
-
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                    {
-                        this.Logger.LogError($"Click event save to FindWise failed for {eventType}: {searchClickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
-                        throw new Exception("AccessDenied");
-                    }
-                    else if (!response.IsSuccessStatusCode)
-                    {
-                        this.Logger.LogError($"Click event save to FindWise failed for {eventType}: {searchClickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
-                        throw new Exception($"Click event save to FindWise failed for {eventType}: {json}");
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-            catch (Exception ex)
-            {
-                throw new Exception($"Click event save to FindWise failed for {eventType}: {searchClickPayloadModel.ClickTargetUrl} :  {ex.Message}");
-            }
+            return await Task.FromResult(true);
         }
 
         /// <summary>
@@ -713,44 +420,7 @@ private async Task<bool> SendSearchEventClickAsync(SearchClickPayloadModel searc
         /// </returns>
         private async Task<bool> SendAutoSuggestionEventClickAsync(AutoSuggestionClickPayloadModel clickPayloadModel)
         {
-            try
-            {
-                if (string.IsNullOrEmpty(this.settings.Findwise.UrlAutoSuggestionClickComponent))
-                {
-                    this.Logger.LogWarning($"The UrlClickComponent is not configured. Auto suggestion click event not send to FindWise.");
-                }
-                else
-                {
-                    var json = JsonConvert.SerializeObject(clickPayloadModel);
-                    var base64EncodedString = BinaryFormatterHelper.Base64EncodeObject(json);
-
-                    var request = $"{this.settings.Findwise.UrlAutoSuggestionClickComponent}?payload={base64EncodedString}";
-
-                    var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.SearchUrl);
-                    var response = await client.PostAsync(request, null).ConfigureAwait(false);
-
-                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-                    {
-                        this.Logger.LogError($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
-                        throw new Exception("AccessDenied");
-                    }
-                    else if (!response.IsSuccessStatusCode)
-                    {
-                        this.Logger.LogError($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
-                        throw new Exception($"Click event save to FindWise failed for Auto suggestion: {json}");
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-            catch (Exception ex)
-            {
-                throw new Exception($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} :  {ex.Message}");
-            }
+            return await Task.FromResult(true);
         }
 
         private string EncodeSearchText(string searchText)
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 3a2cb8961..a40466948 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
@@ -25,7 +25,7 @@
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="IdentityModel" Version="5.2.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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 b275eae94..c2ac38a24 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
@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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 a18eb4196..a10f69fd6 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
@@ -10,7 +10,7 @@
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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 bb23ca661..ba2b9fc16 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
@@ -9,7 +9,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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 82a9b4aa6..d555f0d12 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
@@ -10,7 +10,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<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 de745363e..c00e268d3 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -12,7 +12,7 @@
 		<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="4.0.12" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.16" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>