diff --git a/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj b/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
index 87d6e83b..a94695e3 100644
--- a/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
+++ b/SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj
@@ -16,8 +16,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.14" />
-    <PackageReference Include="Shared" Version="2025.1.1" />
-    <PackageReference Include="Shared.Results" Version="2025.1.1" />
+    <PackageReference Include="Shared" Version="2025.5.4" />
+    <PackageReference Include="Shared.Results" Version="2025.5.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SecurityService.Client/SecurityService.Client.csproj b/SecurityService.Client/SecurityService.Client.csproj
index 0de13040..0ebcd177 100644
--- a/SecurityService.Client/SecurityService.Client.csproj
+++ b/SecurityService.Client/SecurityService.Client.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="2025.1.1" />
-    <PackageReference Include="Shared.Results" Version="2025.1.1" />
+    <PackageReference Include="ClientProxyBase" Version="2025.5.4" />
+    <PackageReference Include="Shared.Results" Version="2025.5.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SecurityService.Database/SecurityService.Database.csproj b/SecurityService.Database/SecurityService.Database.csproj
index b23c5def..807c0a41 100644
--- a/SecurityService.Database/SecurityService.Database.csproj
+++ b/SecurityService.Database/SecurityService.Database.csproj
@@ -23,7 +23,7 @@
 		</PackageReference>
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
 		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
-		<PackageReference Include="Shared" Version="2025.1.1" />
+		<PackageReference Include="Shared" Version="2025.5.4" />
 	</ItemGroup>
 	<ItemGroup>
     <Folder Include="DbContexts\" />
diff --git a/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj b/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
index 08d5b146..45e365d5 100644
--- a/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
+++ b/SecurityService.IntegrationTesting.Helpers/SecurityService.IntegrationTesting.Helpers.csproj
@@ -19,7 +19,7 @@
     <!--<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
     <PackageReference Include="Reqnroll.xUnit" Version="1.0.1" />-->
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.1.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.5.4" />
     <!--<PackageReference Include="Shouldly" Version="4.2.1" />-->
     <!--<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 	    <PrivateAssets>all</PrivateAssets>
diff --git a/SecurityService.IntegrationTesting.Helpers/SecurityServiceSteps.cs b/SecurityService.IntegrationTesting.Helpers/SecurityServiceSteps.cs
index fda9a860..af9bf673 100644
--- a/SecurityService.IntegrationTesting.Helpers/SecurityServiceSteps.cs
+++ b/SecurityService.IntegrationTesting.Helpers/SecurityServiceSteps.cs
@@ -21,7 +21,7 @@ public SecurityServiceSteps(ISecurityServiceClient securityServiceClient){
 
     private async Task CreateApiScope(CreateApiScopeRequest createApiScopeRequest,
                                                               CancellationToken cancellationToken){
-        var result = await this.SecurityServiceClient
+        Result? result = await this.SecurityServiceClient
                                                                   .CreateApiScope(createApiScopeRequest, cancellationToken).ConfigureAwait(false);
         result.IsSuccess.ShouldBeTrue();
     }
@@ -56,7 +56,7 @@ public async Task GivenTheFollowingApiResourcesExist(DataTable table){
             splitScopes.ForEach(a => { createApiResourceRequest.Scopes.Add(a.Trim()); });
             splitUserClaims.ForEach(a => { createApiResourceRequest.UserClaims.Add(a.Trim()); });
 
-            var result = await this.SecurityServiceClient.CreateApiResource(createApiResourceRequest, CancellationToken.None).ConfigureAwait(false);
+            Result? result = await this.SecurityServiceClient.CreateApiResource(createApiResourceRequest, CancellationToken.None).ConfigureAwait(false);
             result.IsSuccess.ShouldBeTrue();
         }
     }
@@ -64,7 +64,7 @@ public async Task GivenTheFollowingApiResourcesExist(DataTable table){
     public async Task<List<(String clientId, String secret, List<String> allowedGrantTypes)>> GivenTheFollowingClientsExist(List<CreateClientRequest> createClientRequests){
         List<(String clientId, String secret, List<String> allowedGrantTypes)> clients = new List<(String clientId, String secret, List<String> allowedGrantTypes)>();
         foreach (CreateClientRequest createClientRequest in createClientRequests){
-            var result = await this.SecurityServiceClient.CreateClient(createClientRequest, CancellationToken.None).ConfigureAwait(false);
+            Result? result = await this.SecurityServiceClient.CreateClient(createClientRequest, CancellationToken.None).ConfigureAwait(false);
             result.IsSuccess.ShouldBeTrue();
             
             // TODO: What do i do here....
@@ -76,25 +76,29 @@ public async Task GivenTheFollowingApiResourcesExist(DataTable table){
 
     public async Task GivenTheFollowingApiResourcesExist(List<CreateApiResourceRequest> requests){
         foreach (CreateApiResourceRequest createApiResourceRequest in requests){
-            var result = await this.SecurityServiceClient.CreateApiResource(createApiResourceRequest, CancellationToken.None).ConfigureAwait(false);
+            Result? result = await this.SecurityServiceClient.CreateApiResource(createApiResourceRequest, CancellationToken.None).ConfigureAwait(false);
             result.IsSuccess.ShouldBeTrue();
         }
     }
 
     public async Task<String> GetClientToken(String clientId, String secret, CancellationToken cancellationToken){
-        TokenResponse tokenResponse = await this.SecurityServiceClient.GetToken(clientId, secret, cancellationToken).ConfigureAwait(false);
-        return tokenResponse.AccessToken;
+        Result<TokenResponse>? tokenResponseResult = await this.SecurityServiceClient.GetToken(clientId, secret, cancellationToken).ConfigureAwait(false);
+        tokenResponseResult.IsSuccess.ShouldBeTrue();
+
+        return tokenResponseResult.Data.AccessToken;
     }
 
     public async Task<String> GetPasswordToken(String clientId, String secret, String userName, String password, CancellationToken cancellationToken)
     {
-        TokenResponse tokenResponse = await this.SecurityServiceClient.GetToken(userName,password, clientId, secret, cancellationToken).ConfigureAwait(false);
-        return tokenResponse.AccessToken;
+        Result<TokenResponse>? tokenResponseResult = await this.SecurityServiceClient.GetToken(userName,password, clientId, secret, cancellationToken).ConfigureAwait(false);
+        tokenResponseResult.IsSuccess.ShouldBeTrue();
+        return tokenResponseResult.Data.AccessToken;
     }
 
     public async Task WhenIGetTheApiResourcesApiResourceDetailsAreReturnedAsFollows(List<ApiResourceDetails> expectedDetails, CancellationToken cancellationToken){
-        List<ApiResourceDetails> apiResourceDetailsList = await this.SecurityServiceClient.GetApiResources(cancellationToken).ConfigureAwait(false);
-
+        Result<List<ApiResourceDetails>>? apiResourceDetailsListResult = await this.SecurityServiceClient.GetApiResources(cancellationToken).ConfigureAwait(false);
+        apiResourceDetailsListResult.IsSuccess.ShouldBeTrue();
+        List<ApiResourceDetails> apiResourceDetailsList = apiResourceDetailsListResult.Data;
         foreach (ApiResourceDetails apiResourceDetails in expectedDetails){
             ApiResourceDetails? foundRecord = apiResourceDetailsList.SingleOrDefault(a => a.Name == apiResourceDetails.Name);
             foundRecord.ShouldNotBeNull();
@@ -111,7 +115,10 @@ public async Task WhenIGetTheApiResourcesApiResourceDetailsAreReturnedAsFollows(
     }
 
     public async Task WhenIGetTheApiResourceWithNameTheApiResourceDetailsAreReturnedAsFollows(List<ApiResourceDetails> expectedDetails, String apiResourceName, CancellationToken cancellationToken){
-        ApiResourceDetails apiResourceDetails = await this.SecurityServiceClient.GetApiResource(apiResourceName, cancellationToken).ConfigureAwait(false);
+        Result<ApiResourceDetails>? apiResourceDetailsResult = await this.SecurityServiceClient.GetApiResource(apiResourceName, cancellationToken).ConfigureAwait(false);
+        apiResourceDetailsResult.IsSuccess.ShouldBeTrue();
+
+        ApiResourceDetails? apiResourceDetails = apiResourceDetailsResult.Data;
         ApiResourceDetails expectedRecord = expectedDetails.Single();
 
         apiResourceDetails.ShouldNotBeNull();
@@ -127,8 +134,10 @@ public async Task WhenIGetTheApiResourceWithNameTheApiResourceDetailsAreReturned
     }
 
     public async Task WhenIGetTheApiScopesApiScopeDetailsAreReturnedAsFollows(List<ApiScopeDetails> expectedDetails, CancellationToken cancellationToken){
-        List<ApiScopeDetails>? apiScopeDetailsList = await this.SecurityServiceClient.GetApiScopes(cancellationToken).ConfigureAwait(false);
+        Result<List<ApiScopeDetails>>? apiScopeDetailsListResult = await this.SecurityServiceClient.GetApiScopes(cancellationToken).ConfigureAwait(false);
+        apiScopeDetailsListResult.IsSuccess.ShouldBeTrue();
 
+        List<ApiScopeDetails>? apiScopeDetailsList = apiScopeDetailsListResult.Data;
         foreach (ApiScopeDetails apiScopeDetails in expectedDetails){
             ApiScopeDetails? foundRecord = apiScopeDetailsList.SingleOrDefault(a => a.Name == apiScopeDetails.Name);
             foundRecord.ShouldNotBeNull();
@@ -138,7 +147,10 @@ public async Task WhenIGetTheApiScopesApiScopeDetailsAreReturnedAsFollows(List<A
     }
 
     public async Task WhenIGetTheApiScopeWithNameTheApiScopeDetailsAreReturnedAsFollows(List<ApiScopeDetails> expectedDetails, String apiScopeName, CancellationToken cancellationToken){
-        ApiScopeDetails? apiScopeDetails = await this.SecurityServiceClient.GetApiScope(apiScopeName, cancellationToken).ConfigureAwait(false);
+        Result<ApiScopeDetails>? apiScopeDetailsResult = await this.SecurityServiceClient.GetApiScope(apiScopeName, cancellationToken).ConfigureAwait(false);
+        apiScopeDetailsResult.IsSuccess.ShouldBeTrue();
+        ApiScopeDetails? apiScopeDetails = apiScopeDetailsResult.Data;
+
         ApiScopeDetails expectedRecord = expectedDetails.Single();
 
         apiScopeDetails.ShouldNotBeNull();
@@ -147,7 +159,9 @@ public async Task WhenIGetTheApiScopeWithNameTheApiScopeDetailsAreReturnedAsFoll
     }
 
     public async Task WhenIGetTheClientWithClientIdTheClientDetailsAreReturnedAsFollows(List<ClientDetails> expectedDetails, String clientId, CancellationToken cancellationToken){
-        ClientDetails clientDetails = await this.SecurityServiceClient.GetClient(clientId, CancellationToken.None).ConfigureAwait(false);
+        Result<ClientDetails>? clientDetailsResult = await this.SecurityServiceClient.GetClient(clientId, CancellationToken.None).ConfigureAwait(false);
+        clientDetailsResult.IsSuccess.ShouldBeTrue();
+        ClientDetails clientDetails = clientDetailsResult.Data;
         ClientDetails expectedRecord = expectedDetails.Single();
 
         clientDetails.ShouldNotBeNull();
@@ -164,8 +178,9 @@ public async Task WhenIGetTheClientWithClientIdTheClientDetailsAreReturnedAsFoll
     }
 
     public async Task WhenIGetTheClientsClientsDetailsAreReturnedAsFollows(List<ClientDetails> expectedDetails, CancellationToken cancellationToken){
-        List<ClientDetails>? clientDetailsList = await this.SecurityServiceClient.GetClients(CancellationToken.None).ConfigureAwait(false);
-
+        Result<List<ClientDetails>>? clientDetailsListResult = await this.SecurityServiceClient.GetClients(CancellationToken.None).ConfigureAwait(false);
+        clientDetailsListResult.IsSuccess.ShouldBeTrue();
+        List<ClientDetails>? clientDetailsList = clientDetailsListResult.Data;
         foreach (ClientDetails expectedRecord in expectedDetails){
             ClientDetails? foundRecord = clientDetailsList.SingleOrDefault(a => a.ClientId == expectedRecord.ClientId);
             foundRecord.ShouldNotBeNull();
@@ -185,14 +200,16 @@ public async Task WhenIGetTheClientsClientsDetailsAreReturnedAsFollows(List<Clie
 
     public async Task GivenICreateTheFollowingIdentityResources(List<CreateIdentityResourceRequest> requests, CancellationToken cancellationToken){
         foreach (CreateIdentityResourceRequest createIdentityResourceRequest in requests){
-            var result = await this.SecurityServiceClient.CreateIdentityResource(createIdentityResourceRequest, cancellationToken).ConfigureAwait(false);
+            Result? result = await this.SecurityServiceClient.CreateIdentityResource(createIdentityResourceRequest, cancellationToken).ConfigureAwait(false);
             result.IsSuccess.ShouldBeTrue();
         }
     }
 
     public async Task WhenIGetTheIdentityResourceWithNameTheIdentityResourceDetailsAreReturnedAsFollows(List<IdentityResourceDetails> expectedDetails, String identityResourceName, CancellationToken cancellationToken)
     {
-        IdentityResourceDetails identityResourceDetails = await this.SecurityServiceClient.GetIdentityResource(identityResourceName, cancellationToken).ConfigureAwait(false);
+        Result<IdentityResourceDetails>? identityResourceDetailsResult = await this.SecurityServiceClient.GetIdentityResource(identityResourceName, cancellationToken).ConfigureAwait(false);
+        identityResourceDetailsResult.IsSuccess.ShouldBeTrue();
+        IdentityResourceDetails identityResourceDetails = identityResourceDetailsResult.Data;
         IdentityResourceDetails expectedRecord = expectedDetails.Single();
 
         identityResourceDetails.Name.ShouldBe(expectedRecord.Name);
@@ -205,8 +222,9 @@ public async Task WhenIGetTheIdentityResourceWithNameTheIdentityResourceDetailsA
     }
 
     public async Task WhenIGetTheIdentityResourcesIdentityResourceDetailsAreReturnedAsFollows(List<IdentityResourceDetails> expectedDetails, CancellationToken cancellationToken){
-        List<IdentityResourceDetails>? identityResourceDetailsList = await this.SecurityServiceClient.GetIdentityResources(CancellationToken.None).ConfigureAwait(false);
-
+        Result<List<IdentityResourceDetails>>? getIdentityResourcesResult = await this.SecurityServiceClient.GetIdentityResources(CancellationToken.None).ConfigureAwait(false);
+        getIdentityResourcesResult.IsSuccess.ShouldBeTrue();
+        List<IdentityResourceDetails>? identityResourceDetailsList = getIdentityResourcesResult.Data;
         foreach (IdentityResourceDetails expectedRecord in expectedDetails){
             IdentityResourceDetails? foundRecord = identityResourceDetailsList.SingleOrDefault(a => a.Name == expectedRecord.Name);
             foundRecord.ShouldNotBeNull();
@@ -223,7 +241,7 @@ public async Task WhenIGetTheIdentityResourcesIdentityResourceDetailsAreReturned
     }
 
     public async Task<List<(String, Guid)>> GivenICreateTheFollowingRoles(List<CreateRoleRequest> requests, CancellationToken cancellationToken) {
-        var roleList = new List<(String, Guid)>();
+        List<(String, Guid)> roleList = new List<(String, Guid)>();
         foreach (CreateRoleRequest request in requests){
             Result? result = await this.SecurityServiceClient.CreateRole(request, cancellationToken).ConfigureAwait(false);
             result.IsSuccess.ShouldBeTrue();
@@ -233,7 +251,7 @@ public async Task WhenIGetTheIdentityResourcesIdentityResourceDetailsAreReturned
         roles.IsSuccess.ShouldBeTrue();
 
         foreach (CreateRoleRequest request in requests) {
-            var r = roles.Data.Single(r => r.RoleName == request.RoleName);
+            RoleDetails r = roles.Data.Single(r => r.RoleName == request.RoleName);
             roleList.Add((r.RoleName, r.RoleId));
         }
 
@@ -242,7 +260,9 @@ public async Task WhenIGetTheIdentityResourcesIdentityResourceDetailsAreReturned
 
     public async Task WhenIGetTheRoleWithNameTheRoleDetailsAreReturnedAsFollows(List<RoleDetails> expectedDetails, Guid roleId, CancellationToken cancellationToken)
     {
-        RoleDetails roleDetails = await this.SecurityServiceClient.GetRole(roleId, cancellationToken).ConfigureAwait(false);
+        Result<RoleDetails>? getRoleResult = await this.SecurityServiceClient.GetRole(roleId, cancellationToken).ConfigureAwait(false);
+        getRoleResult.IsSuccess.ShouldBeTrue();
+        RoleDetails roleDetails =getRoleResult.Data;
         RoleDetails expectedRecord = expectedDetails.Single();
 
         roleDetails.RoleName.ShouldBe(expectedRecord.RoleName);
@@ -250,7 +270,9 @@ public async Task WhenIGetTheRoleWithNameTheRoleDetailsAreReturnedAsFollows(List
 
     public async Task WhenIGetTheRolesRolesDetailsAreReturnedAsFollows(List<RoleDetails> expectedDetails, CancellationToken cancellationToken)
     {
-        List<RoleDetails>? rolesList = await this.SecurityServiceClient.GetRoles(CancellationToken.None).ConfigureAwait(false);
+        Result<List<RoleDetails>>? getRolesResult = await this.SecurityServiceClient.GetRoles(CancellationToken.None).ConfigureAwait(false);
+        getRolesResult.IsSuccess.ShouldBeTrue();
+        List<RoleDetails>? rolesList = getRolesResult.Data;
         foreach (RoleDetails expectedRecord in expectedDetails)
         {
             RoleDetails? foundRecord = rolesList.SingleOrDefault(a => a.RoleName == expectedRecord.RoleName);
@@ -262,10 +284,10 @@ public async Task WhenIGetTheRolesRolesDetailsAreReturnedAsFollows(List<RoleDeta
     public async Task<List<(String, Guid)>> GivenICreateTheFollowingUsers(List<CreateUserRequest> requests, CancellationToken cancellationToken){
         List<(String, Guid)> results = new List<(String, Guid)>();
         foreach (CreateUserRequest createUserRequest in requests){
-            var result = await this.SecurityServiceClient.CreateUser(createUserRequest, cancellationToken).ConfigureAwait(false);
+            Result? result = await this.SecurityServiceClient.CreateUser(createUserRequest, cancellationToken).ConfigureAwait(false);
             result.IsSuccess.ShouldBeTrue();
 
-            var user = await this.SecurityServiceClient.GetUsers(createUserRequest.EmailAddress, cancellationToken);
+            Result<List<UserDetails>>? user = await this.SecurityServiceClient.GetUsers(createUserRequest.EmailAddress, cancellationToken);
             user.IsSuccess.ShouldBeTrue();
 
             results.Add((createUserRequest.EmailAddress, user.Data.Single().UserId));
@@ -275,7 +297,9 @@ public async Task WhenIGetTheRolesRolesDetailsAreReturnedAsFollows(List<RoleDeta
 
     public async Task WhenIGetTheUsersUsersDetailsAreReturnedAsFollows(List<UserDetails> expectedDetails, CancellationToken cancellationToken)
     {
-        List<UserDetails>? usersList = await this.SecurityServiceClient.GetUsers(String.Empty, CancellationToken.None).ConfigureAwait(false);
+        Result<List<UserDetails>>? getUsersResult = await this.SecurityServiceClient.GetUsers(String.Empty, CancellationToken.None).ConfigureAwait(false);
+        getUsersResult.IsSuccess.ShouldBeTrue();
+        List<UserDetails>? usersList = getUsersResult.Data;
         foreach (UserDetails expectedRecord in expectedDetails)
         {
             UserDetails? foundRecord = usersList.SingleOrDefault(a => a.UserName == expectedRecord.UserName);
diff --git a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
index c78c8354..1aa34b2a 100644
--- a/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
+++ b/SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
     <PackageReference Include="Reqnroll.NUnit" Version="2.4.0" />
 
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.1.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.5.4" />
     <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.14" />
     
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
index 4d90f5ea..0a42c99e 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs
@@ -120,10 +120,11 @@ protected async Task DoTestUIHealthCheck()
             await Retry.For(async () => {
                                 this.Trace($"About to do health check for Test UI");
 
-                                String healthCheck =
+                                SimpleResults.Result<String> healthCheck =
                                     await this.HealthCheckClient.PerformHealthCheck("https", "127.0.0.1", this.SecurityServiceTestUIPort, CancellationToken.None);
 
-                                HealthCheckResult result = JsonConvert.DeserializeObject<HealthCheckResult>(healthCheck);
+                                healthCheck.IsSuccess.ShouldBeTrue($"Health check for Test UI failed with [{healthCheck.Message}]");
+                                HealthCheckResult result = JsonConvert.DeserializeObject<HealthCheckResult>(healthCheck.Data);
 
                                 this.Trace($"health check complete for Test UI result is [{healthCheck}]");
 
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/Common/SharedSteps.cs b/SecurityService.OpenIdConnect.IntegrationTests/Common/SharedSteps.cs
index e6c4b4b6..7b8215b4 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/Common/SharedSteps.cs
+++ b/SecurityService.OpenIdConnect.IntegrationTests/Common/SharedSteps.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using SimpleResults;
 
 namespace SecurityService.OpenIdConnect.IntegrationTests.Common
 {
@@ -76,10 +77,11 @@ public async Task GivenICreateTheFollowingApiResources(DataTable table)
         private async Task CreateIdentityResource(CreateIdentityResourceRequest createIdentityResourceRequest,
                                                                              CancellationToken cancellationToken)
         {
-            List<IdentityResourceDetails> identityResourceList = await this.TestingContext.DockerHelper.SecurityServiceClient.GetIdentityResources(cancellationToken);
-
+            Result<List<IdentityResourceDetails>> identityResourceListResult = await this.TestingContext.DockerHelper.SecurityServiceClient.GetIdentityResources(cancellationToken);
+            identityResourceListResult.IsSuccess.ShouldBeTrue();
+            List<IdentityResourceDetails> identityResourceList = identityResourceListResult.Data;
             if (identityResourceList == null || identityResourceList.Any() == false) {
-                var result = await this.TestingContext.DockerHelper.SecurityServiceClient.CreateIdentityResource(createIdentityResourceRequest, cancellationToken).ConfigureAwait(false);
+                Result result = await this.TestingContext.DockerHelper.SecurityServiceClient.CreateIdentityResource(createIdentityResourceRequest, cancellationToken).ConfigureAwait(false);
                 result.IsSuccess.ShouldBeTrue();
 
                 this.TestingContext.IdentityResources.Add(createIdentityResourceRequest.Name);
@@ -91,7 +93,7 @@ private async Task CreateIdentityResource(CreateIdentityResourceRequest createId
                     return;
                 }
 
-                var result = await this
+                Result result = await this
                                                        .TestingContext.DockerHelper.SecurityServiceClient
                                                        .CreateIdentityResource(createIdentityResourceRequest, cancellationToken)
                                                        .ConfigureAwait(false);
diff --git a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
index 0367b614..b5adad96 100644
--- a/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
+++ b/SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj
@@ -24,7 +24,7 @@
     
     <PackageReference Include="Selenium.Support" Version="4.29.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.29.0" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="2025.1.1" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="2025.5.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/SecurityService.UserInterface/SecurityService.UserInterface.csproj b/SecurityService.UserInterface/SecurityService.UserInterface.csproj
index d72dbb6a..d220ba52 100644
--- a/SecurityService.UserInterface/SecurityService.UserInterface.csproj
+++ b/SecurityService.UserInterface/SecurityService.UserInterface.csproj
@@ -16,7 +16,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.14" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-		<PackageReference Include="Shared" Version="2025.1.1" />
+		<PackageReference Include="Shared" Version="2025.5.4" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/SecurityService/Controllers/ApiResourceController.cs b/SecurityService/Controllers/ApiResourceController.cs
index 14c413cc..ae7e8871 100644
--- a/SecurityService/Controllers/ApiResourceController.cs
+++ b/SecurityService/Controllers/ApiResourceController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Shared.Results;
+using Shared.Results.Web;
 using SimpleResults;
 
 namespace SecurityService.Controllers
@@ -82,13 +83,12 @@ public async Task<IActionResult> GetApiResource([FromRoute] String apiResourceNa
         {
             SecurityServiceQueries.GetApiResourceQuery query = new(apiResourceName);
 
-            var result= await this.Mediator.Send(query, cancellationToken);
-            // TODO:: handle failure
+            Result<ApiResource> result= await this.Mediator.Send(query, cancellationToken);
             // return the result
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            ApiResourceDetails model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
@@ -105,12 +105,12 @@ public async Task<IActionResult> GetApiResource([FromRoute] String apiResourceNa
         public async Task<IActionResult> GetApiResources(CancellationToken cancellationToken) {
             SecurityServiceQueries.GetApiResourcesQuery query = new SecurityServiceQueries.GetApiResourcesQuery();
 
-            var result = await this.Mediator.Send(query, cancellationToken);
+            Result<List<ApiResource>> result = await this.Mediator.Send(query, cancellationToken);
 
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            List<ApiResourceDetails> model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
diff --git a/SecurityService/Controllers/ApiScopeController.cs b/SecurityService/Controllers/ApiScopeController.cs
index 5a9304c7..c69edc35 100644
--- a/SecurityService/Controllers/ApiScopeController.cs
+++ b/SecurityService/Controllers/ApiScopeController.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using SecurityService.BusinessLogic.RequestHandlers;
 using SecurityService.BusinessLogic.Requests;
+using Shared.Results.Web;
 using SimpleResults;
 
 namespace SecurityService.Controllers
@@ -50,8 +51,9 @@ public async Task<IActionResult> CreateApiScope([FromBody] CreateApiScopeRequest
                 createApiScopeRequest.DisplayName,
                 createApiScopeRequest.Description);
 
-            var result = await this.Mediator.Send(command, cancellationToken);
-            // TODO: Handle failed result
+            Result result = await this.Mediator.Send(command, cancellationToken);
+            if (result.IsFailed)
+                return result.ToActionResultX();
 
             // return the result
             return result.ToActionResultX();
@@ -94,12 +96,12 @@ public async Task<IActionResult> GetApiScopes(CancellationToken cancellationToke
         {
             SecurityServiceQueries.GetApiScopesQuery query = new();
 
-            var result = await this.Mediator.Send(query, cancellationToken);
+            Result<List<ApiScope>> result = await this.Mediator.Send(query, cancellationToken);
 
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            List<ApiScopeDetails> model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
diff --git a/SecurityService/Controllers/ClientController.cs b/SecurityService/Controllers/ClientController.cs
index 113e40e4..c7c6439c 100644
--- a/SecurityService/Controllers/ClientController.cs
+++ b/SecurityService/Controllers/ClientController.cs
@@ -1,4 +1,5 @@
-using SimpleResults;
+using Shared.Results.Web;
+using SimpleResults;
 
 namespace SecurityService.Controllers
 {
@@ -85,8 +86,10 @@ public async Task<IActionResult> CreateClient([FromBody] CreateClientRequest cre
                                                                                                                    createClientRequest.AllowOfflineAccess);
             
             // Create the client
-            var result = await this.Mediator.Send(command, cancellationToken);
-            // TODO: handle failed result
+            Result result = await this.Mediator.Send(command, cancellationToken);
+
+            if (result.IsFailed)
+                return result.ToActionResultX();
 
             // return the result
             return this.Created($"{ClientController.ControllerRoute}/{createClientRequest.ClientId}",
@@ -111,12 +114,12 @@ public async Task<IActionResult> GetClient([FromRoute] String clientId,
         {
             SecurityServiceQueries.GetClientQuery query = new(clientId);
 
-            var result= await this.Mediator.Send(query, cancellationToken);
+            Result<Duende.IdentityServer.Models.Client> result= await this.Mediator.Send(query, cancellationToken);
 
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            ClientDetails model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
@@ -134,12 +137,12 @@ public async Task<IActionResult> GetClients(CancellationToken cancellationToken)
         {
             SecurityServiceQueries.GetClientsQuery query = new();
 
-            var result = await this.Mediator.Send(query, cancellationToken);
+            Result<List<Duende.IdentityServer.Models.Client>> result = await this.Mediator.Send(query, cancellationToken);
 
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            List<ClientDetails> model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
diff --git a/SecurityService/Controllers/IdentityResourceController.cs b/SecurityService/Controllers/IdentityResourceController.cs
index 631180f5..e5d1997e 100644
--- a/SecurityService/Controllers/IdentityResourceController.cs
+++ b/SecurityService/Controllers/IdentityResourceController.cs
@@ -1,4 +1,5 @@
-using SimpleResults;
+using Shared.Results.Web;
+using SimpleResults;
 
 namespace SecurityService.Controllers
 {
@@ -80,8 +81,9 @@ public async Task<IActionResult> CreateIdentityResource([FromBody] CreateIdentit
                                                                                                                                        createIdentityResourceRequest.ShowInDiscoveryDocument,
                                                                                                                                        createIdentityResourceRequest.Claims);
 
-            var result = await this.Mediator.Send(command, cancellationToken);
-            // TODO: Handle failed result
+            Result result = await this.Mediator.Send(command, cancellationToken);
+            if (result.IsFailed)
+                return result.ToActionResultX();
 
             // return the result
             return this.Created($"{IdentityResourceController.ControllerRoute}/{createIdentityResourceRequest.Name}",
@@ -111,7 +113,7 @@ public async Task<IActionResult> GetIdentityResource([FromRoute] String identity
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            IdentityResourceDetails model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
@@ -133,7 +135,7 @@ public async Task<IActionResult> GetIdentityResources(CancellationToken cancella
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            List<IdentityResourceDetails> model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
diff --git a/SecurityService/Controllers/RoleController.cs b/SecurityService/Controllers/RoleController.cs
index be2af0bd..12782137 100644
--- a/SecurityService/Controllers/RoleController.cs
+++ b/SecurityService/Controllers/RoleController.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Shared.Results;
+using Shared.Results.Web;
 using SimpleResults;
 
 namespace SecurityService.Controllers
@@ -61,8 +62,10 @@ public async Task<IActionResult> CreateRole([FromBody] CreateRoleRequest createR
             Guid roleId = Guid.NewGuid();
             SecurityServiceCommands.CreateRoleCommand command  = new(roleId, createRoleRequest.RoleName);
 
-            var result = await this.Mediator.Send(command, cancellationToken);
-            // TODO: Handle failed result
+            Result result = await this.Mediator.Send(command, cancellationToken);
+            if (result.IsFailed)
+                return result.ToActionResultX();
+            
             // return the result
             return result.ToActionResultX();
         }
@@ -82,12 +85,12 @@ public async Task<IActionResult> GetRole([FromRoute] Guid roleId,
         {
             SecurityServiceQueries.GetRoleQuery query = new(roleId);
 
-            var result = await this.Mediator.Send(query, cancellationToken);
+            Result<Models.RoleDetails> result = await this.Mediator.Send(query, cancellationToken);
 
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            RoleDetails model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
@@ -106,12 +109,12 @@ public async Task<IActionResult> GetRoles(CancellationToken cancellationToken)
         {
             SecurityServiceQueries.GetRolesQuery query = new();
 
-            var result = await this.Mediator.Send(query, cancellationToken);
+            Result<List<Models.RoleDetails>> result = await this.Mediator.Send(query, cancellationToken);
 
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            List<RoleDetails> model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
diff --git a/SecurityService/Controllers/UserController.cs b/SecurityService/Controllers/UserController.cs
index ef2116b0..2966a0aa 100644
--- a/SecurityService/Controllers/UserController.cs
+++ b/SecurityService/Controllers/UserController.cs
@@ -1,4 +1,5 @@
 using Shared.Results;
+using Shared.Results.Web;
 using SimpleResults;
 
 namespace SecurityService.Controllers
@@ -81,7 +82,8 @@ public async Task<IActionResult> CreateUser([FromBody] CreateUserRequest createU
 
             // Create the user
             Result result = await this.Mediator.Send(command, cancellationToken);
-            // TODO: Handle failed result
+            if (result.IsFailed)
+                return result.ToActionResultX();
 
             // return the result
             return result.ToActionResultX();
@@ -102,12 +104,12 @@ public async Task<IActionResult> GetUser([FromRoute] Guid userId,
         {
             SecurityServiceQueries.GetUserQuery query = new(userId);
 
-            var result = await this.Mediator.Send(query, cancellationToken);
+            Result<Models.UserDetails> result = await this.Mediator.Send(query, cancellationToken);
 
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            UserDetails model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
@@ -133,7 +135,7 @@ public async Task<IActionResult> GetUsers([FromQuery] String userName,
             if (result.IsFailed)
                 return result.ToActionResultX();
 
-            var model = this.ModelFactory.ConvertFrom(result.Data);
+            List<UserDetails> model = this.ModelFactory.ConvertFrom(result.Data);
 
             return Result.Success(model).ToActionResultX();
         }
diff --git a/SecurityService/SecurityService.csproj b/SecurityService/SecurityService.csproj
index 537d936f..2ddfc587 100644
--- a/SecurityService/SecurityService.csproj
+++ b/SecurityService/SecurityService.csproj
@@ -35,6 +35,8 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
 
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
+
+    <PackageReference Include="Shared.Results.Web" Version="2025.5.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.3.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
diff --git a/SecurityServiceTestUI/SecurityServiceTestUI.csproj b/SecurityServiceTestUI/SecurityServiceTestUI.csproj
index 932a3e82..67fd758a 100644
--- a/SecurityServiceTestUI/SecurityServiceTestUI.csproj
+++ b/SecurityServiceTestUI/SecurityServiceTestUI.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.14" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
-    <PackageReference Include="Shared" Version="2025.1.1" />
+    <PackageReference Include="Shared" Version="2025.5.4" />
   </ItemGroup>
 
   <ItemGroup>