From ba6802296a45b1772703c6b619270665dbc57a7d Mon Sep 17 00:00:00 2001
From: Luke Wilson <luke.wilson@toptal.com>
Date: Tue, 29 Jun 2021 14:38:37 +0100
Subject: [PATCH 1/2] fix: booking partners link and client registration
 location

---
 .gitignore                                    |   3 +
 .../Custom/Account/AccountController.cs       |   1 -
 .../Client/ClientRegistrationController.cs    |  37 ++-----
 .../Custom/Client/ClientStore.cs              |   4 +-
 .../Custom/Grants/BookingPartnerViewModel.cs  |   2 -
 .../Grants/BookingPartnersController.cs       | 104 +++++++++---------
 .../Custom/Grants/PersistedGrantStore.cs      |  37 +++----
 .../Custom/Profile/ProfileService.cs          |   5 -
 .../Custom/Resources/Config.cs                |   1 -
 .../Resources/CustomIdentityResource.cs       |   3 -
 .../Custom/Users/Extensions.cs                |   4 -
 .../Custom/Users/Interfaces.cs                |   8 +-
 .../Users/ResourceOwnerPasswordValidator.cs   |   3 -
 .../Custom/Users/UserRepository.cs            |   6 +-
 .../Program.cs                                |   2 +-
 .../Startup.cs                                |   3 -
 .../BookingPartnerCreate.cshtml               |   3 +-
 .../BookingPartners/BookingPartnerEdit.cshtml |   3 +-
 .../Views/BookingPartners/Index.cshtml        |  12 +-
 19 files changed, 96 insertions(+), 145 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07370c31..c83e3a48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -333,3 +333,6 @@ ASALocalRun/
 
 # MacOS
 .DS_Store
+
+# Fake database
+*fakedatabase.db
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountController.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountController.cs
index 789d167f..46b159c8 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountController.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountController.cs
@@ -9,7 +9,6 @@
 using IdentityServer4.Models;
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
-using IdentityServer4.Test;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs
index b974de5f..80cf3669 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs
@@ -1,18 +1,11 @@
 using IdentityModel;
-using IdentityServer4.Events;
-using IdentityServer4.Extensions;
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
 using OpenActive.FakeDatabase.NET;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Numerics;
-using System.Security.Cryptography;
-using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
@@ -23,11 +16,11 @@ namespace IdentityServer
     // [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
     [Consumes("application/json")]
     [Produces("application/json")]
-    public class ClientResistrationController : ControllerBase
+    public class ClientRegistrationController : ControllerBase
     {
         private readonly IClientStore _clients;
 
-        public ClientResistrationController(IClientStore clients)
+        public ClientRegistrationController(IClientStore clients)
         {
             _clients = clients;
         }
@@ -38,34 +31,23 @@ public ClientResistrationController(IClientStore clients)
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         public async Task<IActionResult> PostAsync([FromBody] ClientRegistrationModel model)
         {
-            if (model.GrantTypes == null)
-            {
-                model.GrantTypes = new[] { OidcConstants.GrantTypes.AuthorizationCode, OidcConstants.GrantTypes.RefreshToken };
-            }
+            model.GrantTypes ??= new[] {OidcConstants.GrantTypes.AuthorizationCode, OidcConstants.GrantTypes.RefreshToken};
 
             if (model.GrantTypes.Any(x => x == OidcConstants.GrantTypes.Implicit) || model.GrantTypes.Any(x => x == OidcConstants.GrantTypes.AuthorizationCode))
             {
                 if (!model.RedirectUris.Any())
-                {
                     return BadRequest("A redirect URI is required for the supplied grant type.");
-                }
 
                 if (model.RedirectUris.Any(redirectUri => !Uri.IsWellFormedUriString(redirectUri, UriKind.Absolute)))
-                {
                     return BadRequest("One or more of the redirect URIs are invalid.");
-                }
             }
 
             // generate a secret for the client
             var key = KeyGenerator.GenerateSecret();
-
-            StringValues headerValues;
             var registrationKey = string.Empty;
 
-            if (Request.Headers.TryGetValue("Authorization", out headerValues))
-            {
+            if (Request.Headers.TryGetValue("Authorization", out var headerValues))
                 registrationKey = headerValues.FirstOrDefault().Substring("Bearer ".Length);
-            }
 
             // update the booking system
             var bookingPartner = FakeBookingSystem.Database.GetBookingPartnerByInitialAccessToken(registrationKey);
@@ -75,7 +57,7 @@ public async Task<IActionResult> PostAsync([FromBody] ClientRegistrationModel mo
             bookingPartner.Registered = true;
             bookingPartner.ClientSecret = key.Sha256();
             bookingPartner.Name = model.ClientName;
-            bookingPartner.ClientProperties = new OpenActive.FakeDatabase.NET.ClientModel
+            bookingPartner.ClientProperties = new ClientModel
             {
                 ClientUri = model.ClientUri,
                 LogoUri = model.LogoUri,
@@ -83,14 +65,14 @@ public async Task<IActionResult> PostAsync([FromBody] ClientRegistrationModel mo
                 RedirectUris = model.RedirectUris,
                 Scope = model.Scope,
             };
+
             FakeBookingSystem.Database.SaveBookingPartner(bookingPartner);
 
             // Read the updated client from the database and reflect back in the request
             var client = await _clients.FindClientByIdAsync(bookingPartner.ClientId);
             if (bookingPartner.ClientSecret != client.ClientSecrets?.FirstOrDefault()?.Value)
-            {
                 return Problem(title: "New client secret not updated in cache", statusCode: 500);
-            }
+
             var response = new ClientRegistrationResponse
             {
                 ClientId = client.ClientId,
@@ -103,7 +85,8 @@ public async Task<IActionResult> PostAsync([FromBody] ClientRegistrationModel mo
                 Scope = string.Join(' ', client.AllowedScopes)
             };
 
-            return CreatedAtAction("ClientRegistration", response);
+            var baseUrl = $"{Request.Scheme}://{Request.Host.Value}/connect/register";
+            return Created($"{baseUrl}/{client.ClientId}", response);
         }
     }
 
@@ -122,7 +105,7 @@ public class ClientRegistrationModel
         public string[] GrantTypes { get; set; }
 
         [JsonPropertyName(OidcConstants.ClientMetadata.RedirectUris)]
-        public string[] RedirectUris { get; set; } = new string[] {};
+        public string[] RedirectUris { get; set; } = {};
 
         public string Scope { get; set; } = "openid profile email";
     }
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientStore.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientStore.cs
index 720b7990..06825f37 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientStore.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientStore.cs
@@ -1,8 +1,6 @@
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
-using Microsoft.Extensions.Logging;
 using OpenActive.FakeDatabase.NET;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,7 +12,7 @@ public class ClientStore : IClientStore
         public Task<Client> FindClientByIdAsync(string clientId)
         {
             var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
-            return Task.FromResult(this.ConvertToIS4Client(bookingPartner));
+            return Task.FromResult(ConvertToIS4Client(bookingPartner));
         }
 
         private Client ConvertToIS4Client(BookingPartnerTable bookingPartner)
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs
index 26cb3e2e..9150fc24 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-
 using OpenActive.FakeDatabase.NET;
 using System;
 using System.Collections.Generic;
@@ -25,5 +24,4 @@ public class BookingPartnerModel
         public IEnumerable<string> ApiGrantNames { get; set; }
         public BookingPartnerTable BookingPartner { get; set; }
     }
-
 }
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs
index 1915f813..53814304 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs
@@ -1,21 +1,16 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
 using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using IdentityServer4.Events;
 using IdentityServer4.Extensions;
 using OpenActive.FakeDatabase.NET;
-using System.Security.Cryptography;
 using System;
-using IdentityServer4.Models;
-using System.Text.RegularExpressions;
+using System.Linq;
 using IdentityServer;
 
 namespace src
@@ -29,17 +24,12 @@ public class BookingPartnersController : Controller
     {
         private readonly IIdentityServerInteractionService _interaction;
         private readonly IClientStore _clients;
-        private readonly IResourceStore _resources;
         private readonly IEventService _events;
 
-        public BookingPartnersController(IIdentityServerInteractionService interaction,
-            IClientStore clients,
-            IResourceStore resources,
-            IEventService events)
+        public BookingPartnersController(IIdentityServerInteractionService interaction, IClientStore clients, IEventService events)
         {
             _interaction = interaction;
             _clients = clients;
-            _resources = resources;
             _events = events;
         }
 
@@ -47,19 +37,21 @@ public BookingPartnersController(IIdentityServerInteractionService interaction,
         /// Show list of grants
         /// </summary>
         [HttpGet]
-        public async Task<IActionResult> Index()
+        public IActionResult Index()
         {
-            return View("Index", await BuildViewModelAsync());
+            return View("Index", BuildViewModel());
         }
 
         /// <summary>
         /// Show list of grants
         /// </summary>
         [HttpGet]
-        public async Task<IActionResult> Edit(string Id)
+        public IActionResult Edit(string id)
         {
-            var content = await BuildBookingPartnerViewModelAsync(Id);
-            if (content == null) return NotFound();
+            var content = BuildBookingPartnerViewModel(id);
+            if (content == null)
+                return NotFound();
+
             return View("BookingPartnerEdit", content);
         }
 
@@ -77,9 +69,9 @@ public async Task<IActionResult> Create()
         /// </summary>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> CreateBookingPartner(string email, string bookingPartnerName)
+        public IActionResult CreateBookingPartner(string email, string bookingPartnerName)
         {
-            var newBookingPartner = new BookingPartnerTable()
+            var newBookingPartner = new BookingPartnerTable
             {
                 ClientId = Guid.NewGuid().ToString(),
                 Name = bookingPartnerName,
@@ -94,7 +86,27 @@ public async Task<IActionResult> CreateBookingPartner(string email, string booki
 
             FakeBookingSystem.Database.AddBookingPartner(newBookingPartner);
 
-            return View("BookingPartnerEdit", await BuildBookingPartnerViewModelAsync(newBookingPartner.ClientId));
+            return View("BookingPartnerEdit", BuildBookingPartnerViewModel(newBookingPartner.ClientId));
+        }
+
+        /// <summary>
+        /// Handle postback to revoke a client
+        /// </summary>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public IActionResult ManageKeys(string clientId)
+        {
+            return RedirectToAction("Index");
+        }
+
+        /// <summary>
+        /// Handle postback to revoke a client
+        /// </summary>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public IActionResult Restore(string clientId)
+        {
+            return RedirectToAction("Index");
         }
 
         /// <summary>
@@ -121,12 +133,7 @@ public async Task<IActionResult> Suspend(string clientId)
             client.AllowedScopes.Remove("openactive-openbooking");
             await _events.RaiseAsync(new GrantsRevokedEvent(User.GetSubjectId(), clientId));
 
-            FakeBookingSystem.Database.UpdateBookingPartnerScope(
-                clientId,
-                "openid profile openactive-ordersfeed",
-                true
-                );
-
+            FakeBookingSystem.Database.UpdateBookingPartnerScope(clientId, "openid profile openactive-ordersfeed", true);
             return RedirectToAction("Index");
         }
 
@@ -135,12 +142,12 @@ public async Task<IActionResult> Suspend(string clientId)
         /// </summary>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> RegenerateKey(string clientId)
+        public IActionResult RegenerateKey(string clientId)
         {
             var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
             FakeBookingSystem.Database.SetBookingPartnerKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
 
-            return View("BookingPartnerEdit", await BuildBookingPartnerViewModelAsync(clientId));
+            return View("BookingPartnerEdit", BuildBookingPartnerViewModel(clientId));
         }
 
         /// <summary>
@@ -148,7 +155,7 @@ public async Task<IActionResult> RegenerateKey(string clientId)
         /// </summary>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> RegenerateAllKeys(string clientId)
+        public IActionResult RegenerateAllKeys(string clientId)
         {
             var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
             FakeBookingSystem.Database.ResetBookingPartnerKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
@@ -157,17 +164,17 @@ public async Task<IActionResult> RegenerateAllKeys(string clientId)
             //var client = await _clients.FindClientByIdAsync(clientId);
             //client.ClientSecrets = new List<Secret>() { new Secret(clientSecret.Sha256()) };
 
-            return View("BookingPartnerEdit", await BuildBookingPartnerViewModelAsync(clientId));
+            return View("BookingPartnerEdit", BuildBookingPartnerViewModel(clientId));
         }
 
-        private async Task<BookingPartnerModel> BuildBookingPartnerViewModelAsync(string clientId)
+        private static BookingPartnerModel BuildBookingPartnerViewModel(string clientId)
         {
             // var client = await _clients.FindClientByIdAsync(clientId);
             var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
+            if (bookingPartner == null)
+                return null;
 
-            if (bookingPartner == null) return null;
-
-            return new BookingPartnerModel()
+            return new BookingPartnerModel
             {
                 ClientId = bookingPartner.ClientId,
                 ClientName = bookingPartner.Name,
@@ -176,28 +183,19 @@ private async Task<BookingPartnerModel> BuildBookingPartnerViewModelAsync(string
                 BookingPartner = bookingPartner
             };
         }
-        private async Task<BookingPartnerViewModel> BuildViewModelAsync()
+        private static BookingPartnerViewModel BuildViewModel()
         {
             var bookingPartners = FakeBookingSystem.Database.GetBookingPartners();
-            var list = new List<BookingPartnerModel>();
-            foreach (var bookingPartner in bookingPartners)
+            var list = bookingPartners.Select(bookingPartner => new BookingPartnerModel
             {
-                var item = new BookingPartnerModel()
-                {
-                    ClientId = bookingPartner.ClientId,
-                    ClientName = bookingPartner.Name,
-                    ClientLogoUrl = bookingPartner.ClientProperties?.LogoUri,
-                    ClientUrl = bookingPartner.ClientProperties?.ClientUri,
-                    BookingPartner = bookingPartner
-                };
-
-                list.Add(item);
-            }
-
-            return new BookingPartnerViewModel
-            {
-                BookingPartners = list
-            };
+                ClientId = bookingPartner.ClientId,
+                ClientName = bookingPartner.Name,
+                ClientLogoUrl = bookingPartner.ClientProperties?.LogoUri,
+                ClientUrl = bookingPartner.ClientProperties?.ClientUri,
+                BookingPartner = bookingPartner
+            }).ToList();
+
+            return new BookingPartnerViewModel { BookingPartners = list };
         }
     }
 }
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
index 9408faa6..becbcf2d 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
@@ -1,7 +1,6 @@
 using IdentityServer4.Models;
 using IdentityServer4.Stores;
 using OpenActive.FakeDatabase.NET;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,21 +12,17 @@ public class AcmePersistedGrantStore : IPersistedGrantStore
         public Task<IEnumerable<PersistedGrant>> GetAllAsync(string subjectId)
         {
             var grants = FakeBookingSystem.Database.GetAllGrants(subjectId);
-
-            List<PersistedGrant> persistedGrants = new List<PersistedGrant>();
-            foreach(var grant in grants)
+            var persistedGrants = grants.Select(grant => new PersistedGrant
             {
-                persistedGrants.Add(new PersistedGrant()
-                {
-                    Key = grant.Key,
-                    Type = grant.Type,
-                    SubjectId = grant.SubjectId,
-                    ClientId = grant.ClientId,
-                    CreationTime = grant.CreationTime,
-                    Expiration = grant.Expiration,
-                    Data = grant.Data
-                });
-            }
+                Key = grant.Key,
+                Type = grant.Type,
+                SubjectId = grant.SubjectId,
+                ClientId = grant.ClientId,
+                CreationTime = grant.CreationTime,
+                Expiration = grant.Expiration,
+                Data = grant.Data
+            }).ToList();
+
             return Task.FromResult<IEnumerable<PersistedGrant>>(persistedGrants);
         }
 
@@ -47,24 +42,28 @@ public Task<PersistedGrant> GetAsync(string key)
             } : null);
         }
 
-        public async Task RemoveAllAsync(string subjectId, string clientId)
+        public Task RemoveAllAsync(string subjectId, string clientId)
         {
             FakeBookingSystem.Database.RemoveGrant(subjectId, clientId);
+            return Task.CompletedTask;
         }
 
-        public async Task RemoveAllAsync(string subjectId, string clientId, string type)
+        public Task RemoveAllAsync(string subjectId, string clientId, string type)
         {
             FakeBookingSystem.Database.RemoveGrant(subjectId, clientId, type);
+            return Task.CompletedTask;
         }
 
-        public async Task RemoveAsync(string key)
+        public Task RemoveAsync(string key)
         {
             FakeBookingSystem.Database.RemoveGrant(key);
+            return Task.CompletedTask;
         }
 
-        public async Task StoreAsync(PersistedGrant grant)
+        public Task StoreAsync(PersistedGrant grant)
         {
             FakeBookingSystem.Database.AddGrant(grant.Key, grant.Type, grant.SubjectId, grant.ClientId, grant.CreationTime, grant.Expiration, grant.Data);
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Profile/ProfileService.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Profile/ProfileService.cs
index 510b6a4e..e0833ac1 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Profile/ProfileService.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Profile/ProfileService.cs
@@ -1,13 +1,8 @@
 using IdentityServer4.Extensions;
 using IdentityServer4.Models;
 using IdentityServer4.Services;
-using IdentityServer4.Test;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Security.Claims;
 using System.Threading.Tasks;
 
 namespace IdentityServer
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Resources/Config.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Resources/Config.cs
index 0b7b2bac..0e949d76 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Resources/Config.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Resources/Config.cs
@@ -3,7 +3,6 @@
 
 
 using IdentityModel;
-using IdentityServer4;
 using IdentityServer4.Models;
 using System.Collections.Generic;
 
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Resources/CustomIdentityResource.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Resources/CustomIdentityResource.cs
index b4f87edb..d5ae5b43 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Resources/CustomIdentityResource.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Resources/CustomIdentityResource.cs
@@ -1,8 +1,5 @@
 using IdentityServer4.Models;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace IdentityServer
 {
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Extensions.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Extensions.cs
index 8ebf91c5..358a7df1 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Extensions.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Extensions.cs
@@ -1,8 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace IdentityServer
 {
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs
index d81a4d1f..2a3073f0 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs
@@ -1,10 +1,4 @@
-using OpenActive.FakeDatabase.NET;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace IdentityServer
+namespace IdentityServer
 {
     public interface IUserRepository
     {
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/ResourceOwnerPasswordValidator.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/ResourceOwnerPasswordValidator.cs
index 95224345..40010d99 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/ResourceOwnerPasswordValidator.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/ResourceOwnerPasswordValidator.cs
@@ -1,8 +1,5 @@
 using IdentityModel;
 using IdentityServer4.Validation;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace IdentityServer
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
index 09a9bcc8..ea8e88f8 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
@@ -1,10 +1,6 @@
-using IdentityModel;
-using OpenActive.FakeDatabase.NET;
-using System;
+using OpenActive.FakeDatabase.NET;
 using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
-using System.Threading.Tasks;
 
 namespace IdentityServer
 {
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Program.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Program.cs
index 8c6d9a5d..e5fb8053 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Program.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Program.cs
@@ -43,7 +43,7 @@ public static int Main(string[] args)
             }
             catch (Exception ex)
             {
-                Log.Fatal(ex, "Host terminated unexpectedly.");
+                Log.Fatal(ex, "Host terminated unexpectedly");
                 return 1;
             }
             finally
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Startup.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Startup.cs
index b759c40f..aaf3bebf 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Startup.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Startup.cs
@@ -1,15 +1,12 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-
-using IdentityServer4.Services;
 using IdentityServer4.Stores;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Configuration;
-using src;
 
 namespace IdentityServer
 {
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerCreate.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerCreate.cshtml
index b010dae8..e94a7db3 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerCreate.cshtml
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerCreate.cshtml
@@ -1,7 +1,6 @@
 @model BookingPartnerModel
-@using System;
 
-    <div class="partner container">
+<div class="partner container">
         <div class="row page-header">
             <div class="col-sm-10">
                 <h1>
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerEdit.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerEdit.cshtml
index 7384d7cd..52c898e0 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerEdit.cshtml
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerEdit.cshtml
@@ -1,7 +1,6 @@
 @model BookingPartnerModel
-@using System;
 
-    <div class="partner container">
+<div class="partner container">
         <div class="row page-header">
             <div class="col-sm-10">
                 <h1>
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/Index.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/Index.cshtml
index cb097ef0..55b91d20 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/Index.cshtml
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/Index.cshtml
@@ -3,17 +3,17 @@
 <div class="grants">
     <div class="row page-header">
         <div class="col-sm-10">
-            <h1>
-                Booking Partners
-            </h1>
+            <h1>Booking Partners</h1>
             <div>Below is the list of applications you have given access to or are pending dynamic registration.</div>
         </div>
     </div>
+
     <div class="row">
         <div class="col-sm-12 text-right">
             <a href="/bookingpartners/create" class="btn btn-md btn-default">Add a Booking Partner</a>
         </div>
     </div>
+
     @if (Model.BookingPartners.Any() == false)
     {
         <div class="row">
@@ -40,6 +40,7 @@
                     {
                         <small class="warning">Bookings suspended</small>
                     }
+
                     @if (!bookingPartner.BookingPartner.Registered)
                     {
                         <small>Pending registration</small>
@@ -49,8 +50,9 @@
                 <div class="col-sm-6">
                     <form asp-action="ManageKeys">
                         <input type="hidden" name="clientId" value="@bookingPartner.ClientId">
-                        <a href="~/bookingpartners/edit/@bookingPartner.ClientId" class="btn btn-md btn-default">API Key</a>
+                        <a href="/BookingPartners/Edit/@bookingPartner.ClientId" class="btn btn-md btn-default">API Key</a>
                     </form>
+
                     @if (bookingPartner.BookingPartner.Registered && !bookingPartner.BookingPartner.BookingsSuspended)
                     {
                         <form asp-action="Suspend">
@@ -58,6 +60,7 @@
                             <button class="btn btn-md btn-default">Suspend Bookings</button>
                         </form>
                     }
+
                     @if (bookingPartner.BookingPartner.Registered && bookingPartner.BookingPartner.BookingsSuspended)
                     {
                         <form asp-action="Restore">
@@ -65,6 +68,7 @@
                             <button class="btn btn-md btn-default">Restore</button>
                         </form>
                     }
+
                     @if (!bookingPartner.BookingPartner.Registered || bookingPartner.BookingPartner.BookingsSuspended)
                     {
                         <form asp-action="Revoke">

From c320e8f904728ca15c3e7db2006e7653a3f76084 Mon Sep 17 00:00:00 2001
From: Luke Wilson <luke.wilson@toptal.com>
Date: Tue, 29 Jun 2021 16:31:24 +0100
Subject: [PATCH 2/2] Make fake database async

---
 .../Custom/Account/AccountController.cs       |  60 +-
 .../Client/ClientRegistrationController.cs    |   4 +-
 .../Custom/Client/ClientStore.cs              |  12 +-
 .../Grants/BookingPartnersController.cs       |  42 +-
 .../Custom/Grants/PersistedGrantStore.cs      |  14 +-
 .../Custom/Profile/ProfileService.cs          |  16 +-
 .../Custom/Users/Interfaces.cs                |  10 +-
 .../Users/ResourceOwnerPasswordValidator.cs   |   8 +-
 .../Custom/Users/UserRepository.cs            |  33 +-
 .../Authentication/HasScopeRequirement.cs     |   4 -
 .../TestHeaderAuthentication.cs               |   1 -
 .../Feeds/FacilitiesFeeds.cs                  |   4 +-
 .../Feeds/OrdersFeed.cs                       |   4 +-
 .../Feeds/SessionsFeeds.cs                    |   4 +-
 Examples/BookingSystem.AspNetCore/Program.cs  |   9 +-
 .../Stores/FacilityStore.cs                   |  76 +-
 .../Stores/OrderStore.cs                      |  70 +-
 .../Stores/SellerStore.cs                     |   2 +-
 .../Stores/SessionStore.cs                    |  80 +-
 .../Properties/AssemblyInfo.cs                |   1 -
 .../App_Start/BundleConfig.cs                 |   5 +-
 .../App_Start/FilterConfig.cs                 |   3 +-
 .../App_Start/IdentityConfig.cs               |   9 +-
 .../App_Start/RouteConfig.cs                  |   6 +-
 .../App_Start/Startup.Auth.cs                 |  13 +-
 .../App_Start/WebApiConfig.cs                 |   9 +-
 .../Controllers/DatasetSiteController.cs      |   5 -
 .../Controllers/OpenDataController.cs         |   6 +-
 .../Feeds/FacilitiesFeeds.cs                  |   4 +-
 .../Feeds/OrdersFeed.cs                       |   4 +-
 .../Feeds/SessionsFeeds.cs                    |   4 +-
 .../Global.asax.cs                            |   1 -
 .../Helpers/AuthenticationHelper.cs           |   1 -
 .../Helpers/OpenBookingInputFormatter.cs      |   3 -
 .../Models/AccountBindingModels.cs            |   4 +-
 .../Models/AccountViewModels.cs               |   3 +-
 .../Models/IdentityModels.cs                  |   1 -
 .../Properties/AssemblyInfo.cs                |   1 -
 .../Stores/FacilityStore.cs                   |  76 +-
 .../Stores/OrderStore.cs                      |  70 +-
 .../Stores/SellerStore.cs                     |   2 +-
 .../Stores/SessionStore.cs                    |  80 +-
 .../Utils/DependencyResolver.cs               |   2 -
 .../FakeBookingSystemTest.cs                  |   2 -
 .../FakeBookingSystem.cs                      | 866 +++++++++---------
 .../FakeDatabaseTransaction.cs                |   4 -
 OpenActive.Server.NET.Tests/IdTemplate.cs     |   1 -
 .../SellerIdComponentsTest.cs                 |   5 +-
 .../StoreBookingEngineTest.cs                 |   5 +-
 .../Entrypoint/IBookingEngine.cs              |   3 -
 .../AuthenticationExtensions.cs               |   2 -
 .../AuthenticationTestHeaders.cs              |   6 +-
 .../OpenActiveCustomClaimNames.cs             |   6 +-
 .../Authentication/OpenActiveScopes.cs        |   6 +-
 .../Beta/AuthenticatedPerson.cs               |   3 -
 .../Content/ResponseContent.cs                |   4 -
 .../Context/BookingFlowContext.cs             |   4 -
 .../ClientRegistrationModel.cs                |   2 -
 .../OidcConstants.cs                          |   6 +-
 .../OpenBookingHelper/Enums/FlowStage.cs      |   6 +-
 .../Enums/TaxPayeeRelationship.cs             |   6 +-
 .../Exceptions/OpenBookingException.cs        |   2 -
 .../IdTransforms/DefaultComponents.cs         |   3 -
 .../OpenBookingHelper/Model/ModelSupport.cs   |   3 -
 .../Model/OrderModelSupport.cs                |   6 +-
 .../OpenBookingHelper/Rpde/OrdersRpdeBase.cs  |   2 -
 .../Rpde/RpdeOrderingStrategyRouter.cs        |   2 +-
 .../Settings/BookingEngineSettings.cs         |   3 -
 .../OpenBookingHelper/Stores/SellerStore.cs   |   3 -
 .../Context/StoreBookingFlowContext.cs        |   2 -
 .../StoreBookingEngine/StoreBookingEngine.cs  |  20 +-
 .../Stores/OpportunityStore.cs                |   1 -
 .../StoreBookingEngine/Stores/OrderStore.cs   |   1 -
 73 files changed, 776 insertions(+), 975 deletions(-)

diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountController.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountController.cs
index 46b159c8..992134c4 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountController.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountController.cs
@@ -81,36 +81,33 @@ public async Task<IActionResult> Login(LoginInputModel model, string button)
             // the user clicked the "cancel" button
             if (button != "login")
             {
-                if (context != null)
-                {
-                    // if the user cancels, send a result back into IdentityServer as if they 
-                    // denied the consent (even if this client does not require consent).
-                    // this will send back an access denied OIDC error response to the client.
-                    await _interaction.GrantConsentAsync(context, ConsentResponse.Denied);
+                if (context == null)
+                    return Redirect("~/");
 
-                    // we can trust model.ReturnUrl since GetAuthorizationContextAsync returned non-null
-                    if (await _clientStore.IsPkceClientAsync(context.ClientId))
-                    {
-                        // if the client is PKCE then we assume it's native, so this change in how to
-                        // return the response is for better UX for the end user.
-                        return View("Redirect", new RedirectViewModel { RedirectUrl = model.ReturnUrl });
-                    }
+                // if the user cancels, send a result back into IdentityServer as if they 
+                // denied the consent (even if this client does not require consent).
+                // this will send back an access denied OIDC error response to the client.
+                await _interaction.GrantConsentAsync(context, ConsentResponse.Denied);
 
-                    return Redirect(model.ReturnUrl);
-                }
-                else
+                // we can trust model.ReturnUrl since GetAuthorizationContextAsync returned non-null
+                if (await _clientStore.IsPkceClientAsync(context.ClientId))
                 {
-                    // since we don't have a valid context, then we just go back to the home page
-                    return Redirect("~/");
+                    // if the client is PKCE then we assume it's native, so this change in how to
+                    // return the response is for better UX for the end user.
+                    return View("Redirect", new RedirectViewModel { RedirectUrl = model.ReturnUrl });
                 }
+
+                return Redirect(model.ReturnUrl);
+
+                // since we don't have a valid context, then we just go back to the home page
             }
 
             if (ModelState.IsValid)
             {
                 // validate username/password against in-memory store
-                if (_users.ValidateCredentials(model.Username, model.Password))
+                if (await _users.ValidateCredentials(model.Username, model.Password))
                 {
-                    var user = _users.FindByUsername(model.Username);
+                    var user = await _users.FindByUsername(model.Username);
                     await _events.RaiseAsync(new UserLoginSuccessEvent(user.Username, user.SubjectId, user.Username, clientId: context?.ClientId));
 
                     // only set explicit expiration here if user chooses "remember me". 
@@ -123,7 +120,7 @@ public async Task<IActionResult> Login(LoginInputModel model, string button)
                             IsPersistent = true,
                             ExpiresUtc = DateTimeOffset.UtcNow.Add(AccountOptions.RememberMeLoginDuration)
                         };
-                    };
+                    }
 
                     // issue authentication cookie with subject ID and username
                     await HttpContext.SignInAsync(user.SubjectId, user.Username, props);
@@ -143,18 +140,13 @@ public async Task<IActionResult> Login(LoginInputModel model, string button)
 
                     // request for a local page
                     if (Url.IsLocalUrl(model.ReturnUrl))
-                    {
                         return Redirect(model.ReturnUrl);
-                    }
-                    else if (string.IsNullOrEmpty(model.ReturnUrl))
-                    {
+
+                    if (string.IsNullOrEmpty(model.ReturnUrl))
                         return Redirect("~/");
-                    }
-                    else
-                    {
-                        // user might have clicked on a malicious link - should be logged
-                        throw new Exception("invalid return URL");
-                    }
+
+                    // user might have clicked on a malicious link - should be logged
+                    throw new Exception("invalid return URL");
                 }
 
                 await _events.RaiseAsync(new UserLoginFailureEvent(model.Username, "invalid credentials", clientId:context?.ClientId));
@@ -165,7 +157,6 @@ public async Task<IActionResult> Login(LoginInputModel model, string button)
             var vm = await BuildLoginViewModelAsync(model);
             return View(vm);
         }
-
         
         /// <summary>
         /// Show logout page
@@ -226,7 +217,6 @@ public IActionResult AccessDenied()
             return View();
         }
 
-
         /*****************************************/
         /* helper APIs for the AccountController */
         /*****************************************/
@@ -242,7 +232,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
                 {
                     EnableLocalLogin = local,
                     ReturnUrl = returnUrl,
-                    Username = context?.LoginHint
+                    Username = context.LoginHint
                 };
 
                 if (!local)
@@ -331,7 +321,7 @@ private async Task<LoggedOutViewModel> BuildLoggedOutViewModelAsync(string logou
             {
                 AutomaticRedirectAfterSignOut = AccountOptions.AutomaticRedirectAfterSignOut,
                 PostLogoutRedirectUri = logout?.PostLogoutRedirectUri,
-                ClientName = string.IsNullOrEmpty(logout?.ClientName) ? logout?.ClientId : logout?.ClientName,
+                ClientName = string.IsNullOrEmpty(logout?.ClientName) ? logout?.ClientId : logout.ClientName,
                 SignOutIframeUrl = logout?.SignOutIFrameUrl,
                 LogoutId = logoutId
             };
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs
index 80cf3669..fe45432d 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs
@@ -50,7 +50,7 @@ public async Task<IActionResult> PostAsync([FromBody] ClientRegistrationModel mo
                 registrationKey = headerValues.FirstOrDefault().Substring("Bearer ".Length);
 
             // update the booking system
-            var bookingPartner = FakeBookingSystem.Database.GetBookingPartnerByInitialAccessToken(registrationKey);
+            var bookingPartner = await FakeBookingSystem.Database.GetBookingPartnerByInitialAccessToken(registrationKey);
             if (bookingPartner == null)
                 return Unauthorized("Initial Access Token is not valid, or is expired");
 
@@ -66,7 +66,7 @@ public async Task<IActionResult> PostAsync([FromBody] ClientRegistrationModel mo
                 Scope = model.Scope,
             };
 
-            FakeBookingSystem.Database.SaveBookingPartner(bookingPartner);
+            await FakeBookingSystem.Database.SaveBookingPartner(bookingPartner);
 
             // Read the updated client from the database and reflect back in the request
             var client = await _clients.FindClientByIdAsync(bookingPartner.ClientId);
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientStore.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientStore.cs
index 06825f37..b89d7b18 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientStore.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientStore.cs
@@ -9,16 +9,18 @@ namespace IdentityServer
 {
     public class ClientStore : IClientStore
     {
-        public Task<Client> FindClientByIdAsync(string clientId)
+        public async Task<Client> FindClientByIdAsync(string clientId)
         {
-            var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
-            return Task.FromResult(ConvertToIS4Client(bookingPartner));
+            var bookingPartner = await FakeBookingSystem.Database.GetBookingPartner(clientId);
+            return ConvertToIS4Client(bookingPartner);
         }
 
         private Client ConvertToIS4Client(BookingPartnerTable bookingPartner)
         {
-            if (bookingPartner == null) return null;
-            return new Client()
+            if (bookingPartner == null)
+                return null;
+
+            return new Client
             {
                 Enabled = bookingPartner.Registered,
                 ClientId = bookingPartner.ClientId,
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs
index 53814304..29bdc820 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs
@@ -37,18 +37,18 @@ public BookingPartnersController(IIdentityServerInteractionService interaction,
         /// Show list of grants
         /// </summary>
         [HttpGet]
-        public IActionResult Index()
+        public async Task<IActionResult> Index()
         {
-            return View("Index", BuildViewModel());
+            return View("Index", await BuildViewModel());
         }
 
         /// <summary>
         /// Show list of grants
         /// </summary>
         [HttpGet]
-        public IActionResult Edit(string id)
+        public async Task<IActionResult> Edit(string id)
         {
-            var content = BuildBookingPartnerViewModel(id);
+            var content = await BuildBookingPartnerViewModel(id);
             if (content == null)
                 return NotFound();
 
@@ -69,7 +69,7 @@ public async Task<IActionResult> Create()
         /// </summary>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public IActionResult CreateBookingPartner(string email, string bookingPartnerName)
+        public async Task<IActionResult> CreateBookingPartner(string email, string bookingPartnerName)
         {
             var newBookingPartner = new BookingPartnerTable
             {
@@ -84,9 +84,8 @@ public IActionResult CreateBookingPartner(string email, string bookingPartnerNam
                 BookingsSuspended = false
             };
 
-            FakeBookingSystem.Database.AddBookingPartner(newBookingPartner);
-
-            return View("BookingPartnerEdit", BuildBookingPartnerViewModel(newBookingPartner.ClientId));
+            await FakeBookingSystem.Database.AddBookingPartner(newBookingPartner);
+            return View("BookingPartnerEdit", await BuildBookingPartnerViewModel(newBookingPartner.ClientId));
         }
 
         /// <summary>
@@ -133,7 +132,7 @@ public async Task<IActionResult> Suspend(string clientId)
             client.AllowedScopes.Remove("openactive-openbooking");
             await _events.RaiseAsync(new GrantsRevokedEvent(User.GetSubjectId(), clientId));
 
-            FakeBookingSystem.Database.UpdateBookingPartnerScope(clientId, "openid profile openactive-ordersfeed", true);
+            await FakeBookingSystem.Database.UpdateBookingPartnerScope(clientId, "openid profile openactive-ordersfeed", true);
             return RedirectToAction("Index");
         }
 
@@ -142,12 +141,12 @@ public async Task<IActionResult> Suspend(string clientId)
         /// </summary>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public IActionResult RegenerateKey(string clientId)
+        public async Task<IActionResult> RegenerateKey(string clientId)
         {
-            var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
-            FakeBookingSystem.Database.SetBookingPartnerKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
+            var bookingPartner = await FakeBookingSystem.Database.GetBookingPartner(clientId);
+            await FakeBookingSystem.Database.SetBookingPartnerKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
 
-            return View("BookingPartnerEdit", BuildBookingPartnerViewModel(clientId));
+            return View("BookingPartnerEdit", await BuildBookingPartnerViewModel(clientId));
         }
 
         /// <summary>
@@ -155,22 +154,22 @@ public IActionResult RegenerateKey(string clientId)
         /// </summary>
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public IActionResult RegenerateAllKeys(string clientId)
+        public async Task<IActionResult> RegenerateAllKeys(string clientId)
         {
-            var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
-            FakeBookingSystem.Database.ResetBookingPartnerKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
+            var bookingPartner = await FakeBookingSystem.Database.GetBookingPartner(clientId);
+            await FakeBookingSystem.Database.ResetBookingPartnerKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
 
             // TODO: Is this cached in memory, does it need updating??
             //var client = await _clients.FindClientByIdAsync(clientId);
             //client.ClientSecrets = new List<Secret>() { new Secret(clientSecret.Sha256()) };
 
-            return View("BookingPartnerEdit", BuildBookingPartnerViewModel(clientId));
+            return View("BookingPartnerEdit", await BuildBookingPartnerViewModel(clientId));
         }
 
-        private static BookingPartnerModel BuildBookingPartnerViewModel(string clientId)
+        private static async Task<BookingPartnerModel> BuildBookingPartnerViewModel(string clientId)
         {
             // var client = await _clients.FindClientByIdAsync(clientId);
-            var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
+            var bookingPartner = await FakeBookingSystem.Database.GetBookingPartner(clientId);
             if (bookingPartner == null)
                 return null;
 
@@ -183,9 +182,10 @@ private static BookingPartnerModel BuildBookingPartnerViewModel(string clientId)
                 BookingPartner = bookingPartner
             };
         }
-        private static BookingPartnerViewModel BuildViewModel()
+
+        private static async Task<BookingPartnerViewModel> BuildViewModel()
         {
-            var bookingPartners = FakeBookingSystem.Database.GetBookingPartners();
+            var bookingPartners = await FakeBookingSystem.Database.GetBookingPartners();
             var list = bookingPartners.Select(bookingPartner => new BookingPartnerModel
             {
                 ClientId = bookingPartner.ClientId,
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
index becbcf2d..4ef01c1a 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
@@ -9,9 +9,9 @@ namespace IdentityServer
 {
     public class AcmePersistedGrantStore : IPersistedGrantStore
     {
-        public Task<IEnumerable<PersistedGrant>> GetAllAsync(string subjectId)
+        public async Task<IEnumerable<PersistedGrant>> GetAllAsync(string subjectId)
         {
-            var grants = FakeBookingSystem.Database.GetAllGrants(subjectId);
+            var grants = await FakeBookingSystem.Database.GetAllGrants(subjectId);
             var persistedGrants = grants.Select(grant => new PersistedGrant
             {
                 Key = grant.Key,
@@ -23,14 +23,14 @@ public Task<IEnumerable<PersistedGrant>> GetAllAsync(string subjectId)
                 Data = grant.Data
             }).ToList();
 
-            return Task.FromResult<IEnumerable<PersistedGrant>>(persistedGrants);
+            return persistedGrants;
         }
 
-        public Task<PersistedGrant> GetAsync(string key)
+        public async Task<PersistedGrant> GetAsync(string key)
         {
-            var grant = FakeBookingSystem.Database.GetGrant(key);
+            var grant = await FakeBookingSystem.Database.GetGrant(key);
 
-            return Task.FromResult(grant != null ? new PersistedGrant()
+            return grant != null ? new PersistedGrant()
             {
                 Key = grant.Key,
                 Type = grant.Type,
@@ -39,7 +39,7 @@ public Task<PersistedGrant> GetAsync(string key)
                 CreationTime = grant.CreationTime,
                 Expiration = grant.Expiration,
                 Data = grant.Data
-            } : null);
+            } : null;
         }
 
         public Task RemoveAllAsync(string subjectId, string clientId)
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Profile/ProfileService.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Profile/ProfileService.cs
index e0833ac1..08756234 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Profile/ProfileService.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Profile/ProfileService.cs
@@ -35,14 +35,14 @@ public ProfileService(IUserRepository users, ILogger<ProfileService> logger)
         /// </summary>
         /// <param name="context">The context.</param>
         /// <returns></returns>
-        public virtual Task GetProfileDataAsync(ProfileDataRequestContext context)
+        public virtual async Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
             context.LogProfileRequest(Logger);
 
             // Claims added here are defined be the API and RESOURCE configurations in Config.cs, only the requested claims will be added to the IssuedClaims collection
             if (context.RequestedClaimTypes.Any())
             {
-                var user = Users.FindBySubjectId(context.Subject.GetSubjectId());
+                var user = await Users.FindBySubjectId(context.Subject.GetSubjectId());
                 if (user != null)
                 {
                     context.AddRequestedClaims(user.Claims);
@@ -52,13 +52,10 @@ public virtual Task GetProfileDataAsync(ProfileDataRequestContext context)
                     {
                         context.IssuedClaims.Add(sellerIdClaim);
                     }
-
                 }
             }
 
             context.LogIssuedClaims(Logger);
-
-            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -67,15 +64,12 @@ public virtual Task GetProfileDataAsync(ProfileDataRequestContext context)
         /// </summary>
         /// <param name="context">The context.</param>
         /// <returns></returns>
-        public virtual Task IsActiveAsync(IsActiveContext context)
+        public virtual async Task IsActiveAsync(IsActiveContext context)
         {
-            Logger.LogDebug("IsActive called from: {caller}", context.Caller);
+            Logger.LogDebug("IsActive called from: {Caller}", context.Caller);
 
-            var user = Users.FindBySubjectId(context.Subject.GetSubjectId());
+            var user = await Users.FindBySubjectId(context.Subject.GetSubjectId());
             context.IsActive = user?.IsActive == true;
-
-            return Task.CompletedTask;
         }
-       
     }
 }
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs
index 2a3073f0..2900161a 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs
@@ -1,9 +1,11 @@
-namespace IdentityServer
+using System.Threading.Tasks;
+
+namespace IdentityServer
 {
     public interface IUserRepository
     {
-        bool ValidateCredentials(string username, string password);
-        UserWithClaims FindBySubjectId(string subjectId);
-        User FindByUsername(string username);
+        Task<bool> ValidateCredentials(string username, string password);
+        Task<UserWithClaims> FindBySubjectId(string subjectId);
+        Task<User> FindByUsername(string username);
     }
 }
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/ResourceOwnerPasswordValidator.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/ResourceOwnerPasswordValidator.cs
index 40010d99..07025669 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/ResourceOwnerPasswordValidator.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/ResourceOwnerPasswordValidator.cs
@@ -13,16 +13,14 @@ public ResourceOwnerPasswordValidator(IUserRepository userRepository)
             _userRepository = userRepository;
         }
 
-        public Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
+        public async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
         {
             // context.Username refers to the cardId; context.Password refers to Lastname
-            if (_userRepository.ValidateCredentials(context.UserName, context.Password))
+            if (await _userRepository.ValidateCredentials(context.UserName, context.Password))
             {
-                var user = _userRepository.FindByUsername(context.UserName);
+                var user = await _userRepository.FindByUsername(context.UserName);
                 context.Result = new GrantValidationResult(user.SubjectId, OidcConstants.AuthenticationMethods.Password);
             }
-
-            return Task.FromResult(0);
         }
     }
 }
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
index ea8e88f8..ae3b5089 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
@@ -1,38 +1,34 @@
 using OpenActive.FakeDatabase.NET;
 using System.Collections.Generic;
 using System.Security.Claims;
+using System.Threading.Tasks;
 
 namespace IdentityServer
 {
     public class UserRepository : IUserRepository
     {
-        private string jsonLdIdBaseUrl;
+        private readonly string _jsonLdIdBaseUrl;
 
         public UserRepository(string jsonLdIdBaseUrl)
         {
-            this.jsonLdIdBaseUrl = jsonLdIdBaseUrl;
+            this._jsonLdIdBaseUrl = jsonLdIdBaseUrl;
         }
 
-        public bool ValidateCredentials(string username, string password)
+        public Task<bool> ValidateCredentials(string username, string password)
         {
             return FakeBookingSystem.Database.ValidateSellerUserCredentials(username, password);
         }
 
-        public UserWithClaims FindBySubjectId(string subjectId)
+        public async Task<UserWithClaims> FindBySubjectId(string subjectId)
         {
-            if (long.TryParse(subjectId, out long longSubjectId))
-            {
-                return GetUserFromSellerUserWithClaims(FakeBookingSystem.Database.GetSellerUserById(longSubjectId));
-            }
-            else
-            {
-                return null;
-            }
+            return long.TryParse(subjectId, out var longSubjectId)
+                ? GetUserFromSellerUserWithClaims(await FakeBookingSystem.Database.GetSellerUserById(longSubjectId))
+                : null;
         }
 
-        public User FindByUsername(string username)
+        public async Task<User> FindByUsername(string username)
         {
-            return GetUserFromSellerUser(FakeBookingSystem.Database.GetSellerUser(username));
+            return GetUserFromSellerUser(await FakeBookingSystem.Database.GetSellerUser(username));
         }
 
         // TODO: Make this an extension method
@@ -54,16 +50,19 @@ private UserWithClaims GetUserFromSellerUserWithClaims(SellerUserTable sellerUse
                 IsActive = true,
                 Claims = new List<Claim>()
             };
+
             AddClaimIfNotNull(user.Claims, "https://openactive.io/sellerName", sellerUser.SellerTable.Name);
-            AddClaimIfNotNull(user.Claims, "https://openactive.io/sellerId", jsonLdIdBaseUrl + "/api/identifiers/sellers/" + sellerUser.SellerTable.Id);
+            AddClaimIfNotNull(user.Claims, "https://openactive.io/sellerId", _jsonLdIdBaseUrl + "/api/identifiers/sellers/" + sellerUser.SellerTable.Id);
             AddClaimIfNotNull(user.Claims, "https://openactive.io/sellerUrl", sellerUser.SellerTable.Url);
             AddClaimIfNotNull(user.Claims, "https://openactive.io/sellerLogo", sellerUser.SellerTable.LogoUrl);
             return user;
         }
 
-        private User GetUserFromSellerUser(SellerUserTable sellerUser)
+        private static User GetUserFromSellerUser(SellerUserTable sellerUser)
         {
-            if (sellerUser == null) return null;
+            if (sellerUser == null)
+                return null;
+
             return new User
             {
                 Username = sellerUser.Username,
diff --git a/Examples/BookingSystem.AspNetCore/Authentication/HasScopeRequirement.cs b/Examples/BookingSystem.AspNetCore/Authentication/HasScopeRequirement.cs
index b18638db..bdbd7400 100644
--- a/Examples/BookingSystem.AspNetCore/Authentication/HasScopeRequirement.cs
+++ b/Examples/BookingSystem.AspNetCore/Authentication/HasScopeRequirement.cs
@@ -1,10 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using OpenActive.NET;
-using OpenActive.Server.NET.OpenBookingHelper;
 using System;
 using System.Linq;
-using System.Security.Claims;
 using System.Threading.Tasks;
 
 namespace BookingSystem.AspNetCore.Helpers
diff --git a/Examples/BookingSystem.AspNetCore/Authentication/TestHeaderAuthentication.cs b/Examples/BookingSystem.AspNetCore/Authentication/TestHeaderAuthentication.cs
index a97f99fa..8c479397 100644
--- a/Examples/BookingSystem.AspNetCore/Authentication/TestHeaderAuthentication.cs
+++ b/Examples/BookingSystem.AspNetCore/Authentication/TestHeaderAuthentication.cs
@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Primitives;
 using OpenActive.NET;
 using OpenActive.Server.NET.OpenBookingHelper;
 using System;
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs
index a53060f2..01783860 100644
--- a/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs
+++ b/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs
@@ -22,7 +22,7 @@ public AcmeFacilityUseRpdeGenerator(bool useSingleSellerMode)
             _useSingleSellerMode = useSingleSellerMode;
         }
 
-        protected async override Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)
+        protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
@@ -124,7 +124,7 @@ public class AcmeFacilityUseSlotRpdeGenerator : RpdeFeedModifiedTimestampAndIdLo
     {
         //public override string FeedPath { get; protected set; } = "example path override";
 
-        protected async override Task<List<RpdeItem<Slot>>> GetRpdeItems(long? afterTimestamp, long? afterId)
+        protected override async Task<List<RpdeItem<Slot>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/OrdersFeed.cs b/Examples/BookingSystem.AspNetCore/Feeds/OrdersFeed.cs
index ba16563b..3aa81ed3 100644
--- a/Examples/BookingSystem.AspNetCore/Feeds/OrdersFeed.cs
+++ b/Examples/BookingSystem.AspNetCore/Feeds/OrdersFeed.cs
@@ -14,7 +14,7 @@ public class AcmeOrdersFeedRpdeGenerator : OrdersRPDEFeedModifiedTimestampAndID
     {
         //public override string FeedPath { get; protected set; } = "example path override";
 
-        protected async override Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
+        protected override async Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
         {
             // Note if using SQL Server it is best to use rowversion as the modified value for the Orders table,
             // and update this class to inherit from OrdersRPDEFeedIncrementingUniqueChangeNumber
@@ -110,7 +110,7 @@ public class AcmeOrderProposalsFeedRpdeGenerator : OrdersRPDEFeedModifiedTimesta
     {
         //public override string FeedPath { get; protected set; } = "example path override";
 
-        protected async override Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
+        protected override async Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs
index f9d0e5cf..662ce910 100644
--- a/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs
+++ b/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs
@@ -15,7 +15,7 @@ public class AcmeScheduledSessionRpdeGenerator : RpdeFeedModifiedTimestampAndIdL
     {
         //public override string FeedPath { get; protected set; } = "example path override";
 
-        protected async override Task<List<RpdeItem<ScheduledSession>>> GetRpdeItems(long? afterTimestamp, long? afterId)
+        protected override async Task<List<RpdeItem<ScheduledSession>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
@@ -72,7 +72,7 @@ public AcmeSessionSeriesRpdeGenerator(bool useSingleSellerMode)
             this._useSingleSellerMode = useSingleSellerMode;
         }
 
-        protected async override Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)
+        protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
diff --git a/Examples/BookingSystem.AspNetCore/Program.cs b/Examples/BookingSystem.AspNetCore/Program.cs
index cb6a7181..a6cf93f6 100644
--- a/Examples/BookingSystem.AspNetCore/Program.cs
+++ b/Examples/BookingSystem.AspNetCore/Program.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 using OpenActive.FakeDatabase.NET;
 
 namespace BookingSystem.AspNetCore
diff --git a/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs
index b6055971..1f22303b 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs
@@ -7,7 +7,6 @@
 using OpenActive.NET;
 using OpenActive.Server.NET.OpenBookingHelper;
 using OpenActive.Server.NET.StoreBooking;
-using ServiceStack.OrmLite;
 using RequiredStatusType = OpenActive.FakeDatabase.NET.RequiredStatusType;
 
 namespace BookingSystem
@@ -24,7 +23,7 @@ public FacilityStore(AppSettings appSettings)
 
         Random rnd = new Random();
 
-        protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDataset(
+        protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDataset(
             string testDatasetIdentifier,
             OpportunityType opportunityType,
             TestOpportunityCriteriaEnumeration criteria,
@@ -45,7 +44,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                     {
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOfflineBookable:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility",
@@ -56,7 +55,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFree:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableUsingPayment:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                              testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility",
@@ -65,7 +64,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFree:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility",
@@ -77,7 +76,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOutsideValidFromBeforeStartDate:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithinValidFromBeforeStartDate;
-                                (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                                (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility {(isValid ? "Within" : "Outside")} Window",
@@ -91,7 +90,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableOutsideWindow:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableWithinWindow;
-                                (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                                (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility {(isValid ? "Within" : "Outside")} Cancellation Window",
@@ -102,7 +101,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                             }
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentOptional:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Optional",
@@ -112,7 +111,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Optional);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentUnavailable:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Unavailable",
@@ -122,7 +121,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Unavailable);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentRequired:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Required",
@@ -132,7 +131,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Required);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNoSpaces:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility No Spaces",
@@ -141,7 +140,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFiveSpaces:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility Five Spaces",
@@ -150,7 +149,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOneSpace:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility One Space",
@@ -159,7 +158,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxNet:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 2,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Tax Net",
@@ -168,7 +167,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxGross:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Tax Gross",
@@ -177,7 +176,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableSellerTermsOfService:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility With Seller Terms Of Service",
@@ -186,7 +185,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAttendeeDetails:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility That Requires Attendee Details",
@@ -196,7 +195,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresAttendeeValidation: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAdditionalDetails:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility That Requires Additional Details",
@@ -206,7 +205,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresAdditionalDetails: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithNegotiation:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility That Allows Proposal Amendment",
@@ -216,7 +215,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 allowProposalAmendment: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNotCancellable:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility Paid That Does Not Allow Full Refund",
@@ -226,7 +225,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 allowCustomerCancellationFullRefund: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableInPast:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility in the Past",
@@ -251,29 +250,29 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
             }
         }
 
-        protected async override Task DeleteTestDataset(string testDatasetIdentifier)
+        protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
-            FakeBookingSystem.Database.DeleteTestFacilitiesFromDataset(testDatasetIdentifier);
+            await FakeBookingSystem.Database.DeleteTestFacilitiesFromDataset(testDatasetIdentifier);
         }
 
-        protected async override Task TriggerTestAction(OpenBookingSimulateAction simulateAction, FacilityOpportunity idComponents)
+        protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, FacilityOpportunity idComponents)
         {
             switch (simulateAction)
             {
                 case ChangeOfLogisticsTimeSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateFacilitySlotStartAndEndTimeByPeriodInMins(idComponents.SlotId.Value, 60))
+                    if (!await FakeBookingSystem.Database.UpdateFacilitySlotStartAndEndTimeByPeriodInMins(idComponents.SlotId.Value, 60))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsNameSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateFacilityUseName(idComponents.SlotId.Value, "Updated Facility Title"))
+                    if (!await FakeBookingSystem.Database.UpdateFacilityUseName(idComponents.SlotId.Value, "Updated Facility Title"))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
+                    if (!await FakeBookingSystem.Database.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -285,7 +284,7 @@ protected async override Task TriggerTestAction(OpenBookingSimulateAction simula
         }
 
         // Similar to the RPDE logic, this needs to render and return an new hypothetical OrderItem from the database based on the supplied opportunity IDs
-        protected async override Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
+        protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
             // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerIdComponents (this is not required if using a Single Seller)
 
@@ -293,15 +292,15 @@ protected async override Task GetOrderItems(List<OrderItemContext<FacilityOpport
 
             // Response OrderItems must be updated into supplied orderItemContexts (including duplicates for multi-party booking)
 
-            var query = orderItemContexts.Select((orderItemContext) =>
+            var query = await Task.WhenAll(orderItemContexts.Select(async orderItemContext =>
             {
-                var getOccurrenceInfoResult = FakeBookingSystem.Database.GetSlotAndBookedOrderItemInfoBySlotId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
+                var getOccurrenceInfoResult = await FakeBookingSystem.Database.GetSlotAndBookedOrderItemInfoBySlotId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
                 var (hasFoundOccurrence, facility, slot, bookedOrderItemInfo) = getOccurrenceInfoResult;
                 if (hasFoundOccurrence == false)
                 {
                     return null;
                 }
-                var remainingUsesIncludingOtherLeases = FakeBookingSystem.Database.GetNumberOfOtherLeasesForSlot(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
+                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.Database.GetNumberOfOtherLeasesForSlot(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
 
                 return new
                 {
@@ -383,8 +382,7 @@ protected async override Task GetOrderItems(List<OrderItemContext<FacilityOpport
                     BookedOrderItemInfo = bookedOrderItemInfo,
                     slot.RemainingUses
                 };
-            });
-
+            }));
 
             // Add the response OrderItems to the relevant contexts (note that the context must be updated within this method)
             foreach (var (item, ctx) in query.Zip(orderItemContexts, (item, ctx) => (item, ctx)))
@@ -417,7 +415,7 @@ protected async override Task GetOrderItems(List<OrderItemContext<FacilityOpport
             }
         }
 
-        protected async override ValueTask LeaseOrderItems(Lease lease, List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask LeaseOrderItems(Lease lease, List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -435,7 +433,7 @@ protected async override ValueTask LeaseOrderItems(Lease lease, List<OrderItemCo
                 else
                 {
                     // Attempt to lease for those with the same IDs, which is atomic
-                    var (result, capacityErrors, capacityLeaseErrors) = FakeDatabase.LeaseOrderItemsForFacilitySlot(databaseTransaction.FakeDatabaseTransaction, flowContext.OrderId.ClientId, flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, flowContext.OrderId.uuid, ctxGroup.Key.SlotId.Value, ctxGroup.Count());
+                    var (result, capacityErrors, capacityLeaseErrors) = await FakeDatabase.LeaseOrderItemsForFacilitySlot(databaseTransaction.FakeDatabaseTransaction, flowContext.OrderId.ClientId, flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, flowContext.OrderId.uuid, ctxGroup.Key.SlotId.Value, ctxGroup.Count());
 
                     switch (result)
                     {
@@ -490,7 +488,7 @@ protected async override ValueTask LeaseOrderItems(Lease lease, List<OrderItemCo
         }
 
         //TODO: This should reuse code of LeaseOrderItem
-        protected async override ValueTask BookOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask BookOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -503,7 +501,7 @@ protected async override ValueTask BookOrderItems(List<OrderItemContext<Facility
                 }
 
                 // Attempt to book for those with the same IDs, which is atomic
-                var (result, bookedOrderItemInfos) = FakeDatabase.BookOrderItemsForFacilitySlot(
+                var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForFacilitySlot(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
                     flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
@@ -540,7 +538,7 @@ protected async override ValueTask BookOrderItems(List<OrderItemContext<Facility
         }
 
         // TODO check logic here, it's just been copied from BookOrderItems. Possibly could remove duplication here.
-        protected async override ValueTask ProposeOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask ProposeOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -554,7 +552,7 @@ protected async override ValueTask ProposeOrderItems(List<OrderItemContext<Facil
                 }
 
                 // Attempt to book for those with the same IDs, which is atomic
-                var (result, bookedOrderItemInfos) = FakeDatabase.BookOrderItemsForFacilitySlot(
+                var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForFacilitySlot(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
                     flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
diff --git a/Examples/BookingSystem.AspNetCore/Stores/OrderStore.cs b/Examples/BookingSystem.AspNetCore/Stores/OrderStore.cs
index 5424039b..2b42e8ef 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/OrderStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/OrderStore.cs
@@ -2,7 +2,6 @@
 using OpenActive.NET;
 using OpenActive.Server.NET.OpenBookingHelper;
 using OpenActive.Server.NET.StoreBooking;
-using ServiceStack.OrmLite;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,11 +27,11 @@ public AcmeOrderStore(AppSettings appSettings)
         /// Note sellerId will always be null in Single Seller mode
         /// </summary>
         /// <returns>True if Order found, False if Order not found</returns>
-        public async override Task<bool> CustomerCancelOrderItems(OrderIdComponents orderId, SellerIdComponents sellerId, List<OrderIdComponents> orderItemIds)
+        public override async Task<bool> CustomerCancelOrderItems(OrderIdComponents orderId, SellerIdComponents sellerId, List<OrderIdComponents> orderItemIds)
         {
             try
             {
-                return FakeBookingSystem.Database.CancelOrderItems(
+                return await FakeBookingSystem.Database.CancelOrderItems(
                     orderId.ClientId,
                     sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                     orderId.uuid,
@@ -51,10 +50,10 @@ public async override Task<bool> CustomerCancelOrderItems(OrderIdComponents orde
         /// <returns>True if OrderProposal found, False if OrderProposal not found</returns>
         public override async Task<bool> CustomerRejectOrderProposal(OrderIdComponents orderId, SellerIdComponents sellerId)
         {
-            return FakeBookingSystem.Database.RejectOrderProposal(orderId.ClientId, sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, orderId.uuid, true);
+            return await FakeBookingSystem.Database.RejectOrderProposal(orderId.ClientId, sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, orderId.uuid, true);
         }
 
-        public async override Task TriggerTestAction(OpenBookingSimulateAction simulateAction, OrderIdComponents orderId)
+        public override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, OrderIdComponents orderId)
         {
             switch (simulateAction)
             {
@@ -63,7 +62,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
-                    if (!FakeBookingSystem.Database.AcceptOrderProposal(orderId.uuid))
+                    if (!await FakeBookingSystem.Database.AcceptOrderProposal(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -74,7 +73,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
                     var version = Guid.NewGuid();
-                    if (!FakeBookingSystem.Database.AmendOrderProposal(orderId.uuid, version))
+                    if (!await FakeBookingSystem.Database.AmendOrderProposal(orderId.uuid, version))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -84,7 +83,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
-                    if (!FakeBookingSystem.Database.RejectOrderProposal(null, null, orderId.uuid, false))
+                    if (!await FakeBookingSystem.Database.RejectOrderProposal(null, null, orderId.uuid, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -94,7 +93,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false, true))
+                    if (!await FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false, true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -104,7 +103,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false))
+                    if (!await FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -114,7 +113,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessCode: true))
+                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessCode: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -124,7 +123,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessPass: true))
+                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessPass: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -134,7 +133,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, true))
+                    if (!await FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -144,7 +143,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, false))
+                    if (!await FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -154,7 +153,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.AddCustomerNotice(orderId.uuid))
+                    if (!await FakeBookingSystem.Database.AddCustomerNotice(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -164,7 +163,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.ReplaceOrderOpportunity(orderId.uuid))
+                    if (!await FakeBookingSystem.Database.ReplaceOrderOpportunity(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -174,7 +173,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessChannel: true))
+                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessChannel: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -207,7 +206,7 @@ private static BrokerType BrokerRoleToBrokerType(BrokerRole brokerRole)
                         : BrokerType.NoBroker;
         }
 
-        public async override ValueTask<Lease> CreateLease(
+        public override async ValueTask<Lease> CreateLease(
             OrderQuote responseOrderQuote,
             StoreBookingFlowContext flowContext,
             OrderStateContext stateContext,
@@ -224,7 +223,7 @@ public async override ValueTask<Lease> CreateLease(
             var leaseExpires = DateTimeOffset.UtcNow + new TimeSpan(0, 5, 0);
             var brokerRole = BrokerTypeToBrokerRole(flowContext.BrokerRole ?? BrokerType.NoBroker);
 
-            var result = FakeDatabase.AddLease(
+            var result = await FakeDatabase.AddLease(
                 flowContext.OrderId.ClientId,
                 flowContext.OrderId.uuid,
                 brokerRole,
@@ -245,32 +244,33 @@ public async override ValueTask<Lease> CreateLease(
             };
         }
 
-        public async override ValueTask UpdateLease(
+        public override ValueTask UpdateLease(
             OrderQuote responseOrderQuote,
             StoreBookingFlowContext flowContext,
             OrderStateContext stateContext,
             OrderTransaction databaseTransaction)
         {
             // Does nothing at the moment
+            return new ValueTask();
         }
 
-        public async override Task DeleteLease(OrderIdComponents orderId, SellerIdComponents sellerId)
+        public override async Task DeleteLease(OrderIdComponents orderId, SellerIdComponents sellerId)
         {
             // Note if no lease support, simply do nothing here
-            FakeBookingSystem.Database.DeleteLease(
+            await FakeBookingSystem.Database.DeleteLease(
                 orderId.ClientId,
                 orderId.uuid,
                 sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */
                 );
         }
 
-        public async override ValueTask CreateOrder(Order responseOrder, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        public override async ValueTask CreateOrder(Order responseOrder, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             if (_appSettings.FeatureFlags.PaymentReconciliationDetailValidation && responseOrder.TotalPaymentDue.Price > 0 && ReconciliationMismatch(flowContext))
                 throw new OpenBookingException(new InvalidPaymentDetailsError(), "Payment reconciliation details do not match");
 
             var customerType = flowContext.Customer == null ? CustomerType.None : (flowContext.Customer.IsOrganization ? CustomerType.Organization : CustomerType.Person);
-            var result = FakeDatabase.AddOrder(
+            var result = await FakeDatabase.AddOrder(
                 flowContext.OrderId.ClientId,
                 flowContext.OrderId.uuid,
                 flowContext.BrokerRole == BrokerType.AgentBroker ? BrokerRole.AgentBroker : flowContext.BrokerRole == BrokerType.ResellerBroker ? BrokerRole.ResellerBroker : BrokerRole.NoBroker,
@@ -297,19 +297,20 @@ public async override ValueTask CreateOrder(Order responseOrder, StoreBookingFlo
             if (!result) throw new OpenBookingException(new OrderAlreadyExistsError());
         }
 
-        public async override ValueTask UpdateOrder(Order responseOrder, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        public override ValueTask UpdateOrder(Order responseOrder, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Does nothing at the moment
+            return new ValueTask();
         }
 
-        public async override ValueTask<(Guid, OrderProposalStatus)> CreateOrderProposal(OrderProposal responseOrderProposal, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        public override async ValueTask<(Guid, OrderProposalStatus)> CreateOrderProposal(OrderProposal responseOrderProposal, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             if (!responseOrderProposal.TotalPaymentDue.Price.HasValue)
                 throw new OpenBookingException(new OpenBookingError(), "Price must be set on TotalPaymentDue");
 
             var version = Guid.NewGuid();
             var customerType = flowContext.Customer == null ? CustomerType.None : (flowContext.Customer.GetType() == typeof(Organization) ? CustomerType.Organization : CustomerType.Person);
-            var result = FakeDatabase.AddOrder(
+            var result = await FakeDatabase.AddOrder(
                 flowContext.OrderId.ClientId,
                 flowContext.OrderId.uuid,
                 flowContext.BrokerRole == BrokerType.AgentBroker ? BrokerRole.AgentBroker : flowContext.BrokerRole == BrokerType.ResellerBroker ? BrokerRole.ResellerBroker : BrokerRole.NoBroker,
@@ -339,14 +340,15 @@ public async override ValueTask UpdateOrder(Order responseOrder, StoreBookingFlo
             return (version, OrderProposalStatus.AwaitingSellerConfirmation);
         }
 
-        public async override ValueTask UpdateOrderProposal(OrderProposal responseOrderProposal, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        public override ValueTask UpdateOrderProposal(OrderProposal responseOrderProposal, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Does nothing at the moment
+            return new ValueTask();
         }
 
-        public async override Task<DeleteOrderResult> DeleteOrder(OrderIdComponents orderId, SellerIdComponents sellerId)
+        public override async Task<DeleteOrderResult> DeleteOrder(OrderIdComponents orderId, SellerIdComponents sellerId)
         {
-            var result = FakeBookingSystem.Database.DeleteOrder(
+            var result = await FakeBookingSystem.Database.DeleteOrder(
                 orderId.ClientId,
                 orderId.uuid,
                 sellerId.SellerIdLong ?? null /* Small hack to allow use of FakeDatabase when in Single Seller mode */);
@@ -365,12 +367,12 @@ public async override Task<DeleteOrderResult> DeleteOrder(OrderIdComponents orde
             }
         }
 
-        public async override Task<bool> CreateOrderFromOrderProposal(OrderIdComponents orderId, SellerIdComponents sellerId, Uri orderProposalVersion, Order order)
+        public override async Task<bool> CreateOrderFromOrderProposal(OrderIdComponents orderId, SellerIdComponents sellerId, Uri orderProposalVersion, Order order)
         {
             // TODO more elegantly extract version UUID from orderProposalVersion (probably much further up the stack?)
             var version = new Guid(orderProposalVersion.ToString().Split('/').Last());
 
-            var result = FakeBookingSystem.Database.BookOrderProposal(
+            var result = await FakeBookingSystem.Database.BookOrderProposal(
                 orderId.ClientId,
                 sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                 orderId.uuid,
@@ -428,9 +430,9 @@ public static Order RenderOrderFromDatabaseResult(Uri orderId, OrderTable dbOrde
             return order;
         }
 
-        public async override Task<Order> GetOrderStatus(OrderIdComponents orderId, SellerIdComponents sellerId, ILegalEntity seller)
+        public override async Task<Order> GetOrderStatus(OrderIdComponents orderId, SellerIdComponents sellerId, ILegalEntity seller)
         {
-            var (getOrderResult, dbOrder, dbOrderItems) = FakeBookingSystem.Database.GetOrderAndOrderItems(
+            var (getOrderResult, dbOrder, dbOrderItems) = await FakeBookingSystem.Database.GetOrderAndOrderItems(
                 orderId.ClientId,
                 sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                 orderId.uuid);
diff --git a/Examples/BookingSystem.AspNetCore/Stores/SellerStore.cs b/Examples/BookingSystem.AspNetCore/Stores/SellerStore.cs
index 73b9f506..d97bc2dd 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/SellerStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/SellerStore.cs
@@ -23,7 +23,7 @@ public AcmeSellerStore(bool useSingleSellerMode)
         }
 
         // If the Seller is not found, simply return null to generate the correct Open Booking error
-        protected async override ValueTask<ILegalEntity> GetSeller(SellerIdComponents sellerIdComponents)
+        protected override async ValueTask<ILegalEntity> GetSeller(SellerIdComponents sellerIdComponents)
         {
             // Note both examples are shown below to demonstrate options available. Only one block of the if statement below is required for an actual implementation.
             if (_useSingleSellerMode)
diff --git a/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs b/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
index 69af2e9c..e9192353 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
@@ -6,7 +6,6 @@
 using OpenActive.Server.NET.StoreBooking;
 using OpenActive.Server.NET.OpenBookingHelper;
 using OpenActive.FakeDatabase.NET;
-using ServiceStack.OrmLite;
 using RequiredStatusType = OpenActive.FakeDatabase.NET.RequiredStatusType;
 using System.Threading.Tasks;
 
@@ -25,7 +24,7 @@ public SessionStore(AppSettings appSettings)
 
         Random rnd = new Random();
 
-        protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDataset(
+        protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDataset(
             string testDatasetIdentifier,
             OpportunityType opportunityType,
             TestOpportunityCriteriaEnumeration criteria,
@@ -45,7 +44,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                     switch (criteria)
                     {
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Event",
@@ -56,7 +55,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFree:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableUsingPayment:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event",
@@ -68,7 +67,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOutsideValidFromBeforeStartDate:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithinValidFromBeforeStartDate;
-                                (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                                (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event {(isValid ? "Within" : "Outside")} Window",
@@ -82,7 +81,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableOutsideWindow:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableWithinWindow;
-                                (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                                (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event {(isValid ? "Within" : "Outside")} Cancellation Window",
@@ -93,7 +92,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                             }
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentOptional:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Optional",
@@ -103,7 +102,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Optional);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentUnavailable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Unavailable",
@@ -113,7 +112,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Unavailable);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentRequired:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Required",
@@ -123,7 +122,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Required);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFree:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event",
@@ -132,7 +131,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNoSpaces:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event No Spaces",
@@ -141,7 +140,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFiveSpaces:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event Five Spaces",
@@ -150,7 +149,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOneSpace:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event One Space",
@@ -159,7 +158,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxNet:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 2,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Tax Net",
@@ -168,7 +167,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxGross:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Tax Gross",
@@ -177,7 +176,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableSellerTermsOfService:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Event With Seller Terms Of Service",
@@ -186,7 +185,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAttendeeDetails:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Requires Attendee Details",
@@ -196,7 +195,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresAttendeeValidation: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAdditionalDetails:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Requires Additional Details",
@@ -206,7 +205,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresAdditionalDetails: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOnlineBookable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Virtual Event",
@@ -216,7 +215,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 isOnlineOrMixedAttendanceMode: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOfflineBookable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Offline Event",
@@ -226,7 +225,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 isOnlineOrMixedAttendanceMode: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithNegotiation:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Allows Proposal Amendment",
@@ -236,7 +235,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 allowProposalAmendment: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNotCancellable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid That Does Not Allow Full Refund",
@@ -246,7 +245,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 allowCustomerCancellationFullRefund: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableInPast:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Sesssion in the Past",
@@ -271,29 +270,29 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
             }
         }
 
-        protected async override Task DeleteTestDataset(string testDatasetIdentifier)
+        protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
-            FakeBookingSystem.Database.DeleteTestClassesFromDataset(testDatasetIdentifier);
+            await FakeBookingSystem.Database.DeleteTestClassesFromDataset(testDatasetIdentifier);
         }
 
-        protected async override Task TriggerTestAction(OpenBookingSimulateAction simulateAction, SessionOpportunity idComponents)
+        protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, SessionOpportunity idComponents)
         {
             switch (simulateAction)
             {
                 case ChangeOfLogisticsTimeSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateScheduledSessionStartAndEndTimeByPeriodInMins(idComponents.ScheduledSessionId.Value, 60))
+                    if (!await FakeBookingSystem.Database.UpdateScheduledSessionStartAndEndTimeByPeriodInMins(idComponents.ScheduledSessionId.Value, 60))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsNameSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateClassTitle(idComponents.ScheduledSessionId.Value, "Updated Class Title"))
+                    if (!await FakeBookingSystem.Database.UpdateClassTitle(idComponents.ScheduledSessionId.Value, "Updated Class Title"))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
+                    if (!await FakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -305,7 +304,7 @@ protected async override Task TriggerTestAction(OpenBookingSimulateAction simula
         }
 
         // Similar to the RPDE logic, this needs to render and return an new hypothetical OrderItem from the database based on the supplied opportunity IDs
-        protected async override Task GetOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
+        protected override async Task GetOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
             // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerIdComponents (this is not required if using a Single Seller)
 
@@ -313,16 +312,16 @@ protected async override Task GetOrderItems(List<OrderItemContext<SessionOpportu
 
             // Response OrderItems must be updated into supplied orderItemContexts (including duplicates for multi-party booking)
 
-            var query = orderItemContexts.Select((orderItemContext) =>
+            var query = await Task.WhenAll(orderItemContexts.Select(async orderItemContext =>
             {
-                var getOccurrenceResultAndRows = FakeBookingSystem.Database.GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
+                var getOccurrenceResultAndRows = await FakeBookingSystem.Database.GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
                 var (hasFoundOccurrence, @class, occurrence, bookedOrderItemInfo) = getOccurrenceResultAndRows;
 
                 if (hasFoundOccurrence == false)
                 {
                     return null;
                 }
-                var remainingUsesIncludingOtherLeases = FakeBookingSystem.Database.GetNumberOfOtherLeaseForOccurrence(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
+                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.Database.GetNumberOfOtherLeaseForOccurrence(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
 
                 return new
                 {
@@ -404,8 +403,7 @@ protected async override Task GetOrderItems(List<OrderItemContext<SessionOpportu
                     BookedOrderItemInfo = bookedOrderItemInfo,
                     occurrence.RemainingSpaces
                 };
-            });
-
+            }));
 
             // Add the response OrderItems to the relevant contexts (note that the context must be updated within this method)
             foreach (var (item, ctx) in query.Zip(orderItemContexts, (item, ctx) => (item, ctx)))
@@ -439,7 +437,7 @@ protected async override Task GetOrderItems(List<OrderItemContext<SessionOpportu
         }
 
 
-        protected async override ValueTask LeaseOrderItems(
+        protected override async ValueTask LeaseOrderItems(
             Lease lease, List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
@@ -471,7 +469,7 @@ protected async override ValueTask LeaseOrderItems(
                     //var existingOpportunities = existingLease[ctxGroup.Key.ScheduledSessionId.Value];
 
                     // Attempt to lease for those with the same IDs, which is atomic
-                    var (result, capacityErrors, capacityLeaseErrors) = FakeDatabase.LeaseOrderItemsForClassOccurrence(
+                    var (result, capacityErrors, capacityLeaseErrors) = await FakeDatabase.LeaseOrderItemsForClassOccurrence(
                         databaseTransaction.FakeDatabaseTransaction,
                         flowContext.OrderId.ClientId,
                         flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
@@ -532,7 +530,7 @@ protected async override ValueTask LeaseOrderItems(
         }
 
         //TODO: This should reuse code of LeaseOrderItem
-        protected async override ValueTask BookOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask BookOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -555,7 +553,7 @@ protected async override ValueTask BookOrderItems(List<OrderItemContext<SessionO
                 }
 
                 // Attempt to book for those with the same IDs, which is atomic
-                var (result, bookedOrderItemInfos) = FakeDatabase.BookOrderItemsForClassOccurrence(
+                var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForClassOccurrence(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
                     flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
@@ -592,7 +590,7 @@ protected async override ValueTask BookOrderItems(List<OrderItemContext<SessionO
         }
 
         // TODO check logic here, it's just been copied from BookOrderItems. Possibly could remove duplication here.
-        protected async override ValueTask ProposeOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask ProposeOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -606,7 +604,7 @@ protected async override ValueTask ProposeOrderItems(List<OrderItemContext<Sessi
                 }
 
                 // Attempt to book for those with the same IDs, which is atomic
-                var (result, bookedOrderItemInfos) = FakeDatabase.BookOrderItemsForClassOccurrence(
+                var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForClassOccurrence(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
                     flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
diff --git a/Examples/BookingSystem.AspNetFramework.Tests/Properties/AssemblyInfo.cs b/Examples/BookingSystem.AspNetFramework.Tests/Properties/AssemblyInfo.cs
index e2b340ec..ca1da7fa 100644
--- a/Examples/BookingSystem.AspNetFramework.Tests/Properties/AssemblyInfo.cs
+++ b/Examples/BookingSystem.AspNetFramework.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/Examples/BookingSystem.AspNetFramework/App_Start/BundleConfig.cs b/Examples/BookingSystem.AspNetFramework/App_Start/BundleConfig.cs
index e5b9bf91..961fd01a 100644
--- a/Examples/BookingSystem.AspNetFramework/App_Start/BundleConfig.cs
+++ b/Examples/BookingSystem.AspNetFramework/App_Start/BundleConfig.cs
@@ -1,7 +1,4 @@
-using System.Web;
-using System.Web.Optimization;
-
-namespace BookingSystem.AspNetFramework
+namespace BookingSystem.AspNetFramework
 {
     //public class BundleConfig
     //{
diff --git a/Examples/BookingSystem.AspNetFramework/App_Start/FilterConfig.cs b/Examples/BookingSystem.AspNetFramework/App_Start/FilterConfig.cs
index aa4e8e07..3ba3cceb 100644
--- a/Examples/BookingSystem.AspNetFramework/App_Start/FilterConfig.cs
+++ b/Examples/BookingSystem.AspNetFramework/App_Start/FilterConfig.cs
@@ -1,5 +1,4 @@
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 
 namespace BookingSystem.AspNetFramework
 {
diff --git a/Examples/BookingSystem.AspNetFramework/App_Start/IdentityConfig.cs b/Examples/BookingSystem.AspNetFramework/App_Start/IdentityConfig.cs
index 7d88a4eb..53cf4434 100644
--- a/Examples/BookingSystem.AspNetFramework/App_Start/IdentityConfig.cs
+++ b/Examples/BookingSystem.AspNetFramework/App_Start/IdentityConfig.cs
@@ -1,11 +1,4 @@
-using System.Threading.Tasks;
-using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.EntityFramework;
-using Microsoft.AspNet.Identity.Owin;
-using Microsoft.Owin;
-using BookingSystem.AspNetFramework.Models;
-
-namespace BookingSystem.AspNetFramework
+namespace BookingSystem.AspNetFramework
 {
     // Configure the application user manager used in this application. UserManager is defined in ASP.NET Identity and is used by the application.
 
diff --git a/Examples/BookingSystem.AspNetFramework/App_Start/RouteConfig.cs b/Examples/BookingSystem.AspNetFramework/App_Start/RouteConfig.cs
index f119ed29..105cc696 100644
--- a/Examples/BookingSystem.AspNetFramework/App_Start/RouteConfig.cs
+++ b/Examples/BookingSystem.AspNetFramework/App_Start/RouteConfig.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
 
 namespace BookingSystem.AspNetFramework
diff --git a/Examples/BookingSystem.AspNetFramework/App_Start/Startup.Auth.cs b/Examples/BookingSystem.AspNetFramework/App_Start/Startup.Auth.cs
index fcb0eff2..363607f7 100644
--- a/Examples/BookingSystem.AspNetFramework/App_Start/Startup.Auth.cs
+++ b/Examples/BookingSystem.AspNetFramework/App_Start/Startup.Auth.cs
@@ -1,15 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.EntityFramework;
-using Microsoft.Owin;
-using Microsoft.Owin.Security.Cookies;
-using Microsoft.Owin.Security.Google;
-using Microsoft.Owin.Security.OAuth;
-using Owin;
-
-namespace BookingSystem.AspNetFramework
+namespace BookingSystem.AspNetFramework
 {
     //public partial class Startup
     //{
diff --git a/Examples/BookingSystem.AspNetFramework/App_Start/WebApiConfig.cs b/Examples/BookingSystem.AspNetFramework/App_Start/WebApiConfig.cs
index c5fa48af..a8b2da7a 100644
--- a/Examples/BookingSystem.AspNetFramework/App_Start/WebApiConfig.cs
+++ b/Examples/BookingSystem.AspNetFramework/App_Start/WebApiConfig.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Web.Http;
-using BookingSystem.AspNetFramework.Helpers;
-using Microsoft.Owin.Security.OAuth;
-using Newtonsoft.Json.Serialization;
+using System.Web.Http;
 
 namespace BookingSystem.AspNetFramework
 {
diff --git a/Examples/BookingSystem.AspNetFramework/Controllers/DatasetSiteController.cs b/Examples/BookingSystem.AspNetFramework/Controllers/DatasetSiteController.cs
index 6441b6ce..c1679550 100644
--- a/Examples/BookingSystem.AspNetFramework/Controllers/DatasetSiteController.cs
+++ b/Examples/BookingSystem.AspNetFramework/Controllers/DatasetSiteController.cs
@@ -1,13 +1,8 @@
 
 using BookingSystem.AspNetFramework.Helpers;
-using OpenActive.DatasetSite.NET;
 using OpenActive.Server.NET;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using System.Web;
 using System.Web.Http;
 // using System.Web.Mvc;
 
diff --git a/Examples/BookingSystem.AspNetFramework/Controllers/OpenDataController.cs b/Examples/BookingSystem.AspNetFramework/Controllers/OpenDataController.cs
index 70f9bf9e..0c2b46d1 100644
--- a/Examples/BookingSystem.AspNetFramework/Controllers/OpenDataController.cs
+++ b/Examples/BookingSystem.AspNetFramework/Controllers/OpenDataController.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
+using System.Net.Http;
 using System.Threading.Tasks;
 using System.Web.Http;
 using BookingSystem.AspNetFramework.Helpers;
-using OpenActive.NET;
 using OpenActive.Server.NET;
 using OpenActive.Server.NET.OpenBookingHelper;
 
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
index a53060f2..01783860 100644
--- a/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
+++ b/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
@@ -22,7 +22,7 @@ public AcmeFacilityUseRpdeGenerator(bool useSingleSellerMode)
             _useSingleSellerMode = useSingleSellerMode;
         }
 
-        protected async override Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)
+        protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
@@ -124,7 +124,7 @@ public class AcmeFacilityUseSlotRpdeGenerator : RpdeFeedModifiedTimestampAndIdLo
     {
         //public override string FeedPath { get; protected set; } = "example path override";
 
-        protected async override Task<List<RpdeItem<Slot>>> GetRpdeItems(long? afterTimestamp, long? afterId)
+        protected override async Task<List<RpdeItem<Slot>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/OrdersFeed.cs b/Examples/BookingSystem.AspNetFramework/Feeds/OrdersFeed.cs
index ba16563b..3aa81ed3 100644
--- a/Examples/BookingSystem.AspNetFramework/Feeds/OrdersFeed.cs
+++ b/Examples/BookingSystem.AspNetFramework/Feeds/OrdersFeed.cs
@@ -14,7 +14,7 @@ public class AcmeOrdersFeedRpdeGenerator : OrdersRPDEFeedModifiedTimestampAndID
     {
         //public override string FeedPath { get; protected set; } = "example path override";
 
-        protected async override Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
+        protected override async Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
         {
             // Note if using SQL Server it is best to use rowversion as the modified value for the Orders table,
             // and update this class to inherit from OrdersRPDEFeedIncrementingUniqueChangeNumber
@@ -110,7 +110,7 @@ public class AcmeOrderProposalsFeedRpdeGenerator : OrdersRPDEFeedModifiedTimesta
     {
         //public override string FeedPath { get; protected set; } = "example path override";
 
-        protected async override Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
+        protected override async Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
index f9d0e5cf..662ce910 100644
--- a/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
+++ b/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
@@ -15,7 +15,7 @@ public class AcmeScheduledSessionRpdeGenerator : RpdeFeedModifiedTimestampAndIdL
     {
         //public override string FeedPath { get; protected set; } = "example path override";
 
-        protected async override Task<List<RpdeItem<ScheduledSession>>> GetRpdeItems(long? afterTimestamp, long? afterId)
+        protected override async Task<List<RpdeItem<ScheduledSession>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
@@ -72,7 +72,7 @@ public AcmeSessionSeriesRpdeGenerator(bool useSingleSellerMode)
             this._useSingleSellerMode = useSingleSellerMode;
         }
 
-        protected async override Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)
+        protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
             using (var db = FakeBookingSystem.Database.Mem.Database.Open())
             {
diff --git a/Examples/BookingSystem.AspNetFramework/Global.asax.cs b/Examples/BookingSystem.AspNetFramework/Global.asax.cs
index 60621d0e..76bdaf2a 100644
--- a/Examples/BookingSystem.AspNetFramework/Global.asax.cs
+++ b/Examples/BookingSystem.AspNetFramework/Global.asax.cs
@@ -1,6 +1,5 @@
 using System.Web.Http;
 using System.Web.Mvc;
-using BookingSystem.AspNetFramework.Helpers;
 
 namespace BookingSystem.AspNetFramework
 {
diff --git a/Examples/BookingSystem.AspNetFramework/Helpers/AuthenticationHelper.cs b/Examples/BookingSystem.AspNetFramework/Helpers/AuthenticationHelper.cs
index 88794300..6fdee4e5 100644
--- a/Examples/BookingSystem.AspNetFramework/Helpers/AuthenticationHelper.cs
+++ b/Examples/BookingSystem.AspNetFramework/Helpers/AuthenticationHelper.cs
@@ -6,7 +6,6 @@
 using System.Net.Http;
 using System.Security.Claims;
 using System.Security.Principal;
-using System.Threading.Tasks;
 
 namespace BookingSystem.AspNetFramework.Helpers
 {
diff --git a/Examples/BookingSystem.AspNetFramework/Helpers/OpenBookingInputFormatter.cs b/Examples/BookingSystem.AspNetFramework/Helpers/OpenBookingInputFormatter.cs
index 79cb6e7a..387e8644 100644
--- a/Examples/BookingSystem.AspNetFramework/Helpers/OpenBookingInputFormatter.cs
+++ b/Examples/BookingSystem.AspNetFramework/Helpers/OpenBookingInputFormatter.cs
@@ -1,10 +1,7 @@
 // using Microsoft.AspNetFramework.Mvc.Formatters;
 using OpenActive.NET;
-using OpenActive.Server.NET.OpenBookingHelper;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Formatting;
 using System.Net.Http.Headers;
diff --git a/Examples/BookingSystem.AspNetFramework/Models/AccountBindingModels.cs b/Examples/BookingSystem.AspNetFramework/Models/AccountBindingModels.cs
index 629e02ab..df63f63d 100644
--- a/Examples/BookingSystem.AspNetFramework/Models/AccountBindingModels.cs
+++ b/Examples/BookingSystem.AspNetFramework/Models/AccountBindingModels.cs
@@ -1,6 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 
 namespace BookingSystem.AspNetFramework.Models
 {
diff --git a/Examples/BookingSystem.AspNetFramework/Models/AccountViewModels.cs b/Examples/BookingSystem.AspNetFramework/Models/AccountViewModels.cs
index 47e84330..06832bc5 100644
--- a/Examples/BookingSystem.AspNetFramework/Models/AccountViewModels.cs
+++ b/Examples/BookingSystem.AspNetFramework/Models/AccountViewModels.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace BookingSystem.AspNetFramework.Models
 {
diff --git a/Examples/BookingSystem.AspNetFramework/Models/IdentityModels.cs b/Examples/BookingSystem.AspNetFramework/Models/IdentityModels.cs
index 47d02ad2..738caae9 100644
--- a/Examples/BookingSystem.AspNetFramework/Models/IdentityModels.cs
+++ b/Examples/BookingSystem.AspNetFramework/Models/IdentityModels.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
-using Microsoft.AspNet.Identity.Owin;
 
 namespace BookingSystem.AspNetFramework.Models
 {
diff --git a/Examples/BookingSystem.AspNetFramework/Properties/AssemblyInfo.cs b/Examples/BookingSystem.AspNetFramework/Properties/AssemblyInfo.cs
index a59b2997..6d847e0a 100644
--- a/Examples/BookingSystem.AspNetFramework/Properties/AssemblyInfo.cs
+++ b/Examples/BookingSystem.AspNetFramework/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
index b6055971..1f22303b 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
@@ -7,7 +7,6 @@
 using OpenActive.NET;
 using OpenActive.Server.NET.OpenBookingHelper;
 using OpenActive.Server.NET.StoreBooking;
-using ServiceStack.OrmLite;
 using RequiredStatusType = OpenActive.FakeDatabase.NET.RequiredStatusType;
 
 namespace BookingSystem
@@ -24,7 +23,7 @@ public FacilityStore(AppSettings appSettings)
 
         Random rnd = new Random();
 
-        protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDataset(
+        protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDataset(
             string testDatasetIdentifier,
             OpportunityType opportunityType,
             TestOpportunityCriteriaEnumeration criteria,
@@ -45,7 +44,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                     {
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOfflineBookable:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility",
@@ -56,7 +55,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFree:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableUsingPayment:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                              testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility",
@@ -65,7 +64,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFree:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility",
@@ -77,7 +76,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOutsideValidFromBeforeStartDate:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithinValidFromBeforeStartDate;
-                                (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                                (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility {(isValid ? "Within" : "Outside")} Window",
@@ -91,7 +90,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableOutsideWindow:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableWithinWindow;
-                                (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                                (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility {(isValid ? "Within" : "Outside")} Cancellation Window",
@@ -102,7 +101,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                             }
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentOptional:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Optional",
@@ -112,7 +111,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Optional);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentUnavailable:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Unavailable",
@@ -122,7 +121,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Unavailable);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentRequired:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Required",
@@ -132,7 +131,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Required);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNoSpaces:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility No Spaces",
@@ -141,7 +140,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFiveSpaces:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility Five Spaces",
@@ -150,7 +149,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOneSpace:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility One Space",
@@ -159,7 +158,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxNet:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 2,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Tax Net",
@@ -168,7 +167,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxGross:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Tax Gross",
@@ -177,7 +176,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableSellerTermsOfService:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility With Seller Terms Of Service",
@@ -186,7 +185,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAttendeeDetails:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility That Requires Attendee Details",
@@ -196,7 +195,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresAttendeeValidation: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAdditionalDetails:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility That Requires Additional Details",
@@ -206,7 +205,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresAdditionalDetails: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithNegotiation:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility That Allows Proposal Amendment",
@@ -216,7 +215,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 allowProposalAmendment: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNotCancellable:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility Paid That Does Not Allow Full Refund",
@@ -226,7 +225,7 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 allowCustomerCancellationFullRefund: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableInPast:
-                            (facilityId, slotId) = FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility in the Past",
@@ -251,29 +250,29 @@ protected async override Task<FacilityOpportunity> CreateOpportunityWithinTestDa
             }
         }
 
-        protected async override Task DeleteTestDataset(string testDatasetIdentifier)
+        protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
-            FakeBookingSystem.Database.DeleteTestFacilitiesFromDataset(testDatasetIdentifier);
+            await FakeBookingSystem.Database.DeleteTestFacilitiesFromDataset(testDatasetIdentifier);
         }
 
-        protected async override Task TriggerTestAction(OpenBookingSimulateAction simulateAction, FacilityOpportunity idComponents)
+        protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, FacilityOpportunity idComponents)
         {
             switch (simulateAction)
             {
                 case ChangeOfLogisticsTimeSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateFacilitySlotStartAndEndTimeByPeriodInMins(idComponents.SlotId.Value, 60))
+                    if (!await FakeBookingSystem.Database.UpdateFacilitySlotStartAndEndTimeByPeriodInMins(idComponents.SlotId.Value, 60))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsNameSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateFacilityUseName(idComponents.SlotId.Value, "Updated Facility Title"))
+                    if (!await FakeBookingSystem.Database.UpdateFacilityUseName(idComponents.SlotId.Value, "Updated Facility Title"))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
+                    if (!await FakeBookingSystem.Database.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -285,7 +284,7 @@ protected async override Task TriggerTestAction(OpenBookingSimulateAction simula
         }
 
         // Similar to the RPDE logic, this needs to render and return an new hypothetical OrderItem from the database based on the supplied opportunity IDs
-        protected async override Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
+        protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
             // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerIdComponents (this is not required if using a Single Seller)
 
@@ -293,15 +292,15 @@ protected async override Task GetOrderItems(List<OrderItemContext<FacilityOpport
 
             // Response OrderItems must be updated into supplied orderItemContexts (including duplicates for multi-party booking)
 
-            var query = orderItemContexts.Select((orderItemContext) =>
+            var query = await Task.WhenAll(orderItemContexts.Select(async orderItemContext =>
             {
-                var getOccurrenceInfoResult = FakeBookingSystem.Database.GetSlotAndBookedOrderItemInfoBySlotId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
+                var getOccurrenceInfoResult = await FakeBookingSystem.Database.GetSlotAndBookedOrderItemInfoBySlotId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
                 var (hasFoundOccurrence, facility, slot, bookedOrderItemInfo) = getOccurrenceInfoResult;
                 if (hasFoundOccurrence == false)
                 {
                     return null;
                 }
-                var remainingUsesIncludingOtherLeases = FakeBookingSystem.Database.GetNumberOfOtherLeasesForSlot(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
+                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.Database.GetNumberOfOtherLeasesForSlot(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
 
                 return new
                 {
@@ -383,8 +382,7 @@ protected async override Task GetOrderItems(List<OrderItemContext<FacilityOpport
                     BookedOrderItemInfo = bookedOrderItemInfo,
                     slot.RemainingUses
                 };
-            });
-
+            }));
 
             // Add the response OrderItems to the relevant contexts (note that the context must be updated within this method)
             foreach (var (item, ctx) in query.Zip(orderItemContexts, (item, ctx) => (item, ctx)))
@@ -417,7 +415,7 @@ protected async override Task GetOrderItems(List<OrderItemContext<FacilityOpport
             }
         }
 
-        protected async override ValueTask LeaseOrderItems(Lease lease, List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask LeaseOrderItems(Lease lease, List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -435,7 +433,7 @@ protected async override ValueTask LeaseOrderItems(Lease lease, List<OrderItemCo
                 else
                 {
                     // Attempt to lease for those with the same IDs, which is atomic
-                    var (result, capacityErrors, capacityLeaseErrors) = FakeDatabase.LeaseOrderItemsForFacilitySlot(databaseTransaction.FakeDatabaseTransaction, flowContext.OrderId.ClientId, flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, flowContext.OrderId.uuid, ctxGroup.Key.SlotId.Value, ctxGroup.Count());
+                    var (result, capacityErrors, capacityLeaseErrors) = await FakeDatabase.LeaseOrderItemsForFacilitySlot(databaseTransaction.FakeDatabaseTransaction, flowContext.OrderId.ClientId, flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, flowContext.OrderId.uuid, ctxGroup.Key.SlotId.Value, ctxGroup.Count());
 
                     switch (result)
                     {
@@ -490,7 +488,7 @@ protected async override ValueTask LeaseOrderItems(Lease lease, List<OrderItemCo
         }
 
         //TODO: This should reuse code of LeaseOrderItem
-        protected async override ValueTask BookOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask BookOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -503,7 +501,7 @@ protected async override ValueTask BookOrderItems(List<OrderItemContext<Facility
                 }
 
                 // Attempt to book for those with the same IDs, which is atomic
-                var (result, bookedOrderItemInfos) = FakeDatabase.BookOrderItemsForFacilitySlot(
+                var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForFacilitySlot(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
                     flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
@@ -540,7 +538,7 @@ protected async override ValueTask BookOrderItems(List<OrderItemContext<Facility
         }
 
         // TODO check logic here, it's just been copied from BookOrderItems. Possibly could remove duplication here.
-        protected async override ValueTask ProposeOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask ProposeOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -554,7 +552,7 @@ protected async override ValueTask ProposeOrderItems(List<OrderItemContext<Facil
                 }
 
                 // Attempt to book for those with the same IDs, which is atomic
-                var (result, bookedOrderItemInfos) = FakeDatabase.BookOrderItemsForFacilitySlot(
+                var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForFacilitySlot(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
                     flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/OrderStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/OrderStore.cs
index 5424039b..2b42e8ef 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/OrderStore.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/OrderStore.cs
@@ -2,7 +2,6 @@
 using OpenActive.NET;
 using OpenActive.Server.NET.OpenBookingHelper;
 using OpenActive.Server.NET.StoreBooking;
-using ServiceStack.OrmLite;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,11 +27,11 @@ public AcmeOrderStore(AppSettings appSettings)
         /// Note sellerId will always be null in Single Seller mode
         /// </summary>
         /// <returns>True if Order found, False if Order not found</returns>
-        public async override Task<bool> CustomerCancelOrderItems(OrderIdComponents orderId, SellerIdComponents sellerId, List<OrderIdComponents> orderItemIds)
+        public override async Task<bool> CustomerCancelOrderItems(OrderIdComponents orderId, SellerIdComponents sellerId, List<OrderIdComponents> orderItemIds)
         {
             try
             {
-                return FakeBookingSystem.Database.CancelOrderItems(
+                return await FakeBookingSystem.Database.CancelOrderItems(
                     orderId.ClientId,
                     sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                     orderId.uuid,
@@ -51,10 +50,10 @@ public async override Task<bool> CustomerCancelOrderItems(OrderIdComponents orde
         /// <returns>True if OrderProposal found, False if OrderProposal not found</returns>
         public override async Task<bool> CustomerRejectOrderProposal(OrderIdComponents orderId, SellerIdComponents sellerId)
         {
-            return FakeBookingSystem.Database.RejectOrderProposal(orderId.ClientId, sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, orderId.uuid, true);
+            return await FakeBookingSystem.Database.RejectOrderProposal(orderId.ClientId, sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, orderId.uuid, true);
         }
 
-        public async override Task TriggerTestAction(OpenBookingSimulateAction simulateAction, OrderIdComponents orderId)
+        public override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, OrderIdComponents orderId)
         {
             switch (simulateAction)
             {
@@ -63,7 +62,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
-                    if (!FakeBookingSystem.Database.AcceptOrderProposal(orderId.uuid))
+                    if (!await FakeBookingSystem.Database.AcceptOrderProposal(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -74,7 +73,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
                     var version = Guid.NewGuid();
-                    if (!FakeBookingSystem.Database.AmendOrderProposal(orderId.uuid, version))
+                    if (!await FakeBookingSystem.Database.AmendOrderProposal(orderId.uuid, version))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -84,7 +83,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
-                    if (!FakeBookingSystem.Database.RejectOrderProposal(null, null, orderId.uuid, false))
+                    if (!await FakeBookingSystem.Database.RejectOrderProposal(null, null, orderId.uuid, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -94,7 +93,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false, true))
+                    if (!await FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false, true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -104,7 +103,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false))
+                    if (!await FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -114,7 +113,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessCode: true))
+                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessCode: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -124,7 +123,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessPass: true))
+                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessPass: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -134,7 +133,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, true))
+                    if (!await FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -144,7 +143,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, false))
+                    if (!await FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -154,7 +153,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.AddCustomerNotice(orderId.uuid))
+                    if (!await FakeBookingSystem.Database.AddCustomerNotice(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -164,7 +163,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.ReplaceOrderOpportunity(orderId.uuid))
+                    if (!await FakeBookingSystem.Database.ReplaceOrderOpportunity(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -174,7 +173,7 @@ public async override Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessChannel: true))
+                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessChannel: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -207,7 +206,7 @@ private static BrokerType BrokerRoleToBrokerType(BrokerRole brokerRole)
                         : BrokerType.NoBroker;
         }
 
-        public async override ValueTask<Lease> CreateLease(
+        public override async ValueTask<Lease> CreateLease(
             OrderQuote responseOrderQuote,
             StoreBookingFlowContext flowContext,
             OrderStateContext stateContext,
@@ -224,7 +223,7 @@ public async override ValueTask<Lease> CreateLease(
             var leaseExpires = DateTimeOffset.UtcNow + new TimeSpan(0, 5, 0);
             var brokerRole = BrokerTypeToBrokerRole(flowContext.BrokerRole ?? BrokerType.NoBroker);
 
-            var result = FakeDatabase.AddLease(
+            var result = await FakeDatabase.AddLease(
                 flowContext.OrderId.ClientId,
                 flowContext.OrderId.uuid,
                 brokerRole,
@@ -245,32 +244,33 @@ public async override ValueTask<Lease> CreateLease(
             };
         }
 
-        public async override ValueTask UpdateLease(
+        public override ValueTask UpdateLease(
             OrderQuote responseOrderQuote,
             StoreBookingFlowContext flowContext,
             OrderStateContext stateContext,
             OrderTransaction databaseTransaction)
         {
             // Does nothing at the moment
+            return new ValueTask();
         }
 
-        public async override Task DeleteLease(OrderIdComponents orderId, SellerIdComponents sellerId)
+        public override async Task DeleteLease(OrderIdComponents orderId, SellerIdComponents sellerId)
         {
             // Note if no lease support, simply do nothing here
-            FakeBookingSystem.Database.DeleteLease(
+            await FakeBookingSystem.Database.DeleteLease(
                 orderId.ClientId,
                 orderId.uuid,
                 sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */
                 );
         }
 
-        public async override ValueTask CreateOrder(Order responseOrder, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        public override async ValueTask CreateOrder(Order responseOrder, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             if (_appSettings.FeatureFlags.PaymentReconciliationDetailValidation && responseOrder.TotalPaymentDue.Price > 0 && ReconciliationMismatch(flowContext))
                 throw new OpenBookingException(new InvalidPaymentDetailsError(), "Payment reconciliation details do not match");
 
             var customerType = flowContext.Customer == null ? CustomerType.None : (flowContext.Customer.IsOrganization ? CustomerType.Organization : CustomerType.Person);
-            var result = FakeDatabase.AddOrder(
+            var result = await FakeDatabase.AddOrder(
                 flowContext.OrderId.ClientId,
                 flowContext.OrderId.uuid,
                 flowContext.BrokerRole == BrokerType.AgentBroker ? BrokerRole.AgentBroker : flowContext.BrokerRole == BrokerType.ResellerBroker ? BrokerRole.ResellerBroker : BrokerRole.NoBroker,
@@ -297,19 +297,20 @@ public async override ValueTask CreateOrder(Order responseOrder, StoreBookingFlo
             if (!result) throw new OpenBookingException(new OrderAlreadyExistsError());
         }
 
-        public async override ValueTask UpdateOrder(Order responseOrder, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        public override ValueTask UpdateOrder(Order responseOrder, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Does nothing at the moment
+            return new ValueTask();
         }
 
-        public async override ValueTask<(Guid, OrderProposalStatus)> CreateOrderProposal(OrderProposal responseOrderProposal, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        public override async ValueTask<(Guid, OrderProposalStatus)> CreateOrderProposal(OrderProposal responseOrderProposal, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             if (!responseOrderProposal.TotalPaymentDue.Price.HasValue)
                 throw new OpenBookingException(new OpenBookingError(), "Price must be set on TotalPaymentDue");
 
             var version = Guid.NewGuid();
             var customerType = flowContext.Customer == null ? CustomerType.None : (flowContext.Customer.GetType() == typeof(Organization) ? CustomerType.Organization : CustomerType.Person);
-            var result = FakeDatabase.AddOrder(
+            var result = await FakeDatabase.AddOrder(
                 flowContext.OrderId.ClientId,
                 flowContext.OrderId.uuid,
                 flowContext.BrokerRole == BrokerType.AgentBroker ? BrokerRole.AgentBroker : flowContext.BrokerRole == BrokerType.ResellerBroker ? BrokerRole.ResellerBroker : BrokerRole.NoBroker,
@@ -339,14 +340,15 @@ public async override ValueTask UpdateOrder(Order responseOrder, StoreBookingFlo
             return (version, OrderProposalStatus.AwaitingSellerConfirmation);
         }
 
-        public async override ValueTask UpdateOrderProposal(OrderProposal responseOrderProposal, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        public override ValueTask UpdateOrderProposal(OrderProposal responseOrderProposal, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Does nothing at the moment
+            return new ValueTask();
         }
 
-        public async override Task<DeleteOrderResult> DeleteOrder(OrderIdComponents orderId, SellerIdComponents sellerId)
+        public override async Task<DeleteOrderResult> DeleteOrder(OrderIdComponents orderId, SellerIdComponents sellerId)
         {
-            var result = FakeBookingSystem.Database.DeleteOrder(
+            var result = await FakeBookingSystem.Database.DeleteOrder(
                 orderId.ClientId,
                 orderId.uuid,
                 sellerId.SellerIdLong ?? null /* Small hack to allow use of FakeDatabase when in Single Seller mode */);
@@ -365,12 +367,12 @@ public async override Task<DeleteOrderResult> DeleteOrder(OrderIdComponents orde
             }
         }
 
-        public async override Task<bool> CreateOrderFromOrderProposal(OrderIdComponents orderId, SellerIdComponents sellerId, Uri orderProposalVersion, Order order)
+        public override async Task<bool> CreateOrderFromOrderProposal(OrderIdComponents orderId, SellerIdComponents sellerId, Uri orderProposalVersion, Order order)
         {
             // TODO more elegantly extract version UUID from orderProposalVersion (probably much further up the stack?)
             var version = new Guid(orderProposalVersion.ToString().Split('/').Last());
 
-            var result = FakeBookingSystem.Database.BookOrderProposal(
+            var result = await FakeBookingSystem.Database.BookOrderProposal(
                 orderId.ClientId,
                 sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                 orderId.uuid,
@@ -428,9 +430,9 @@ public static Order RenderOrderFromDatabaseResult(Uri orderId, OrderTable dbOrde
             return order;
         }
 
-        public async override Task<Order> GetOrderStatus(OrderIdComponents orderId, SellerIdComponents sellerId, ILegalEntity seller)
+        public override async Task<Order> GetOrderStatus(OrderIdComponents orderId, SellerIdComponents sellerId, ILegalEntity seller)
         {
-            var (getOrderResult, dbOrder, dbOrderItems) = FakeBookingSystem.Database.GetOrderAndOrderItems(
+            var (getOrderResult, dbOrder, dbOrderItems) = await FakeBookingSystem.Database.GetOrderAndOrderItems(
                 orderId.ClientId,
                 sellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                 orderId.uuid);
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/SellerStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/SellerStore.cs
index 73b9f506..d97bc2dd 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/SellerStore.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/SellerStore.cs
@@ -23,7 +23,7 @@ public AcmeSellerStore(bool useSingleSellerMode)
         }
 
         // If the Seller is not found, simply return null to generate the correct Open Booking error
-        protected async override ValueTask<ILegalEntity> GetSeller(SellerIdComponents sellerIdComponents)
+        protected override async ValueTask<ILegalEntity> GetSeller(SellerIdComponents sellerIdComponents)
         {
             // Note both examples are shown below to demonstrate options available. Only one block of the if statement below is required for an actual implementation.
             if (_useSingleSellerMode)
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs
index 69af2e9c..e9192353 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs
@@ -6,7 +6,6 @@
 using OpenActive.Server.NET.StoreBooking;
 using OpenActive.Server.NET.OpenBookingHelper;
 using OpenActive.FakeDatabase.NET;
-using ServiceStack.OrmLite;
 using RequiredStatusType = OpenActive.FakeDatabase.NET.RequiredStatusType;
 using System.Threading.Tasks;
 
@@ -25,7 +24,7 @@ public SessionStore(AppSettings appSettings)
 
         Random rnd = new Random();
 
-        protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDataset(
+        protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDataset(
             string testDatasetIdentifier,
             OpportunityType opportunityType,
             TestOpportunityCriteriaEnumeration criteria,
@@ -45,7 +44,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                     switch (criteria)
                     {
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Event",
@@ -56,7 +55,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFree:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableUsingPayment:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event",
@@ -68,7 +67,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOutsideValidFromBeforeStartDate:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithinValidFromBeforeStartDate;
-                                (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                                (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event {(isValid ? "Within" : "Outside")} Window",
@@ -82,7 +81,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableOutsideWindow:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableWithinWindow;
-                                (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                                (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event {(isValid ? "Within" : "Outside")} Cancellation Window",
@@ -93,7 +92,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                             }
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentOptional:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Optional",
@@ -103,7 +102,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Optional);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentUnavailable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Unavailable",
@@ -113,7 +112,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Unavailable);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentRequired:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Required",
@@ -123,7 +122,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Required);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFree:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event",
@@ -132,7 +131,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNoSpaces:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event No Spaces",
@@ -141,7 +140,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFiveSpaces:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event Five Spaces",
@@ -150,7 +149,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOneSpace:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event One Space",
@@ -159,7 +158,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxNet:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 2,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Tax Net",
@@ -168,7 +167,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxGross:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Tax Gross",
@@ -177,7 +176,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableSellerTermsOfService:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Event With Seller Terms Of Service",
@@ -186,7 +185,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAttendeeDetails:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Requires Attendee Details",
@@ -196,7 +195,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresAttendeeValidation: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAdditionalDetails:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Requires Additional Details",
@@ -206,7 +205,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresAdditionalDetails: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOnlineBookable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Virtual Event",
@@ -216,7 +215,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 isOnlineOrMixedAttendanceMode: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOfflineBookable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Offline Event",
@@ -226,7 +225,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 isOnlineOrMixedAttendanceMode: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithNegotiation:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Allows Proposal Amendment",
@@ -236,7 +235,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 allowProposalAmendment: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNotCancellable:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid That Does Not Allow Full Refund",
@@ -246,7 +245,7 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 allowCustomerCancellationFullRefund: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableInPast:
-                            (classId, occurrenceId) = FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Sesssion in the Past",
@@ -271,29 +270,29 @@ protected async override Task<SessionOpportunity> CreateOpportunityWithinTestDat
             }
         }
 
-        protected async override Task DeleteTestDataset(string testDatasetIdentifier)
+        protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
-            FakeBookingSystem.Database.DeleteTestClassesFromDataset(testDatasetIdentifier);
+            await FakeBookingSystem.Database.DeleteTestClassesFromDataset(testDatasetIdentifier);
         }
 
-        protected async override Task TriggerTestAction(OpenBookingSimulateAction simulateAction, SessionOpportunity idComponents)
+        protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, SessionOpportunity idComponents)
         {
             switch (simulateAction)
             {
                 case ChangeOfLogisticsTimeSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateScheduledSessionStartAndEndTimeByPeriodInMins(idComponents.ScheduledSessionId.Value, 60))
+                    if (!await FakeBookingSystem.Database.UpdateScheduledSessionStartAndEndTimeByPeriodInMins(idComponents.ScheduledSessionId.Value, 60))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsNameSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateClassTitle(idComponents.ScheduledSessionId.Value, "Updated Class Title"))
+                    if (!await FakeBookingSystem.Database.UpdateClassTitle(idComponents.ScheduledSessionId.Value, "Updated Class Title"))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!FakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
+                    if (!await FakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -305,7 +304,7 @@ protected async override Task TriggerTestAction(OpenBookingSimulateAction simula
         }
 
         // Similar to the RPDE logic, this needs to render and return an new hypothetical OrderItem from the database based on the supplied opportunity IDs
-        protected async override Task GetOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
+        protected override async Task GetOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
             // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerIdComponents (this is not required if using a Single Seller)
 
@@ -313,16 +312,16 @@ protected async override Task GetOrderItems(List<OrderItemContext<SessionOpportu
 
             // Response OrderItems must be updated into supplied orderItemContexts (including duplicates for multi-party booking)
 
-            var query = orderItemContexts.Select((orderItemContext) =>
+            var query = await Task.WhenAll(orderItemContexts.Select(async orderItemContext =>
             {
-                var getOccurrenceResultAndRows = FakeBookingSystem.Database.GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
+                var getOccurrenceResultAndRows = await FakeBookingSystem.Database.GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
                 var (hasFoundOccurrence, @class, occurrence, bookedOrderItemInfo) = getOccurrenceResultAndRows;
 
                 if (hasFoundOccurrence == false)
                 {
                     return null;
                 }
-                var remainingUsesIncludingOtherLeases = FakeBookingSystem.Database.GetNumberOfOtherLeaseForOccurrence(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
+                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.Database.GetNumberOfOtherLeaseForOccurrence(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
 
                 return new
                 {
@@ -404,8 +403,7 @@ protected async override Task GetOrderItems(List<OrderItemContext<SessionOpportu
                     BookedOrderItemInfo = bookedOrderItemInfo,
                     occurrence.RemainingSpaces
                 };
-            });
-
+            }));
 
             // Add the response OrderItems to the relevant contexts (note that the context must be updated within this method)
             foreach (var (item, ctx) in query.Zip(orderItemContexts, (item, ctx) => (item, ctx)))
@@ -439,7 +437,7 @@ protected async override Task GetOrderItems(List<OrderItemContext<SessionOpportu
         }
 
 
-        protected async override ValueTask LeaseOrderItems(
+        protected override async ValueTask LeaseOrderItems(
             Lease lease, List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
@@ -471,7 +469,7 @@ protected async override ValueTask LeaseOrderItems(
                     //var existingOpportunities = existingLease[ctxGroup.Key.ScheduledSessionId.Value];
 
                     // Attempt to lease for those with the same IDs, which is atomic
-                    var (result, capacityErrors, capacityLeaseErrors) = FakeDatabase.LeaseOrderItemsForClassOccurrence(
+                    var (result, capacityErrors, capacityLeaseErrors) = await FakeDatabase.LeaseOrderItemsForClassOccurrence(
                         databaseTransaction.FakeDatabaseTransaction,
                         flowContext.OrderId.ClientId,
                         flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
@@ -532,7 +530,7 @@ protected async override ValueTask LeaseOrderItems(
         }
 
         //TODO: This should reuse code of LeaseOrderItem
-        protected async override ValueTask BookOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask BookOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -555,7 +553,7 @@ protected async override ValueTask BookOrderItems(List<OrderItemContext<SessionO
                 }
 
                 // Attempt to book for those with the same IDs, which is atomic
-                var (result, bookedOrderItemInfos) = FakeDatabase.BookOrderItemsForClassOccurrence(
+                var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForClassOccurrence(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
                     flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
@@ -592,7 +590,7 @@ protected async override ValueTask BookOrderItems(List<OrderItemContext<SessionO
         }
 
         // TODO check logic here, it's just been copied from BookOrderItems. Possibly could remove duplication here.
-        protected async override ValueTask ProposeOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
+        protected override async ValueTask ProposeOrderItems(List<OrderItemContext<SessionOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext, OrderTransaction databaseTransaction)
         {
             // Check that there are no conflicts between the supplied opportunities
             // Also take into account spaces requested across OrderItems against total spaces in each opportunity
@@ -606,7 +604,7 @@ protected async override ValueTask ProposeOrderItems(List<OrderItemContext<Sessi
                 }
 
                 // Attempt to book for those with the same IDs, which is atomic
-                var (result, bookedOrderItemInfos) = FakeDatabase.BookOrderItemsForClassOccurrence(
+                var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForClassOccurrence(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
                     flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
diff --git a/Examples/BookingSystem.AspNetFramework/Utils/DependencyResolver.cs b/Examples/BookingSystem.AspNetFramework/Utils/DependencyResolver.cs
index 13c4d957..f39a0575 100644
--- a/Examples/BookingSystem.AspNetFramework/Utils/DependencyResolver.cs
+++ b/Examples/BookingSystem.AspNetFramework/Utils/DependencyResolver.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Web;
 using Microsoft.Extensions.DependencyInjection;
 using System.Web.Http.Dependencies;
 
diff --git a/Fakes/OpenActive.FakeDatabase.NET.Tests/FakeBookingSystemTest.cs b/Fakes/OpenActive.FakeDatabase.NET.Tests/FakeBookingSystemTest.cs
index b0b6faa5..016ee482 100644
--- a/Fakes/OpenActive.FakeDatabase.NET.Tests/FakeBookingSystemTest.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET.Tests/FakeBookingSystemTest.cs
@@ -1,10 +1,8 @@
 using Xunit;
 using System.Linq;
 using Xunit.Abstractions;
-using OpenActive.FakeDatabase.NET;
 using System;
 using ServiceStack.OrmLite;
-using System.Collections.Generic;
 using System.Data;
 
 namespace OpenActive.FakeDatabase.NET.Test
diff --git a/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs b/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs
index fbe8da2f..efac6cd1 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs
@@ -11,6 +11,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
+using ServiceStack.OrmLite.Dapper;
 
 namespace OpenActive.FakeDatabase.NET
 {
@@ -23,7 +24,7 @@ public static class FakeBookingSystem
         /// <summary>
         /// The Database is created as static, to simulate the persistence of a real database
         /// </summary>
-        public static FakeDatabase Database { get; } = FakeDatabase.GetPrepopulatedFakeDatabase();
+        public static FakeDatabase Database { get; } = FakeDatabase.GetPrepopulatedFakeDatabase().Result;
 
         public static void Initialise()
         {
@@ -31,13 +32,19 @@ public static void Initialise()
             // This SQLite database file is shared between the Booking System and Identity Server, and
             // Initialise() must be called on startup of each to ensure they do not wipe the database
             // on the first call to it
+#pragma warning disable 4014
             Database.GetBookingPartners();
+#pragma warning restore 4014
         }
 
         public static DateTime Truncate(this DateTime dateTime, TimeSpan timeSpan)
         {
-            if (timeSpan == TimeSpan.Zero) return dateTime; // Or could throw an ArgumentException
-            if (dateTime == DateTime.MinValue || dateTime == DateTime.MaxValue) return dateTime; // do not modify "guard" values
+            if (timeSpan == TimeSpan.Zero)
+                return dateTime; // Or could throw an ArgumentException
+
+            if (dateTime == DateTime.MinValue || dateTime == DateTime.MaxValue)
+                return dateTime; // do not modify "guard" values
+
             return dateTime.AddTicks(-(dateTime.Ticks % timeSpan.Ticks));
         }
     }
@@ -54,7 +61,8 @@ internal static class HashExtensions
         /// <returns>A hash</returns>
         public static string Sha256(this string input)
         {
-            if (string.IsNullOrWhiteSpace(input)) return string.Empty;
+            if (string.IsNullOrWhiteSpace(input))
+                return string.Empty;
 
             using (var sha = SHA256.Create())
             {
@@ -75,7 +83,7 @@ public InMemorySQLite()
         {
             // ServiceStack registers a memory cache client by default <see href="https://docs.servicestack.net/caching">https://docs.servicestack.net/caching</see>
             // There are issues with transactions when using full in-memory SQLite. To workaround this, we create a temporary file and use this to hold the SQLite database.
-            string connectionString = Path.GetTempPath() + "openactive-fakedatabase.db";
+            var connectionString = Path.GetTempPath() + "openactive-fakedatabase.db";
             Database = new OrmLiteConnectionFactory(connectionString, SqliteDialect.Provider);
 
             using (var connection = Database.Open())
@@ -172,35 +180,35 @@ static FakeDatabase()
         /// <summary>
         /// TODO: Call this on a schedule from both .NET Core and .NET Framework reference implementations
         /// </summary>
-        public void CleanupExpiredLeases()
+        public async Task CleanupExpiredLeases()
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 var occurrenceIds = new List<long>();
                 var slotIds = new List<long>();
 
-                foreach (var order in db.Select<OrderTable>(x => x.LeaseExpires < DateTimeOffset.Now))
+                foreach (var order in await db.SelectAsync<OrderTable>(x => x.LeaseExpires < DateTimeOffset.Now))
                 {
                     // ReSharper disable twice PossibleInvalidOperationException
-                    occurrenceIds.AddRange(db.Select<OrderItemsTable>(x => x.OrderId == order.OrderId && x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value));
-                    slotIds.AddRange(db.Select<OrderItemsTable>(x => x.OrderId == order.OrderId && x.SlotId.HasValue).Select(x => x.SlotId.Value));
-                    db.Delete<OrderItemsTable>(x => x.OrderId == order.OrderId);
-                    db.Delete<OrderTable>(x => x.OrderId == order.OrderId);
+                    occurrenceIds.AddRange((await db.SelectAsync<OrderItemsTable>(x => x.OrderId == order.OrderId && x.OccurrenceId.HasValue)).Select(x => x.OccurrenceId.Value));
+                    slotIds.AddRange((await db.SelectAsync<OrderItemsTable>(x => x.OrderId == order.OrderId && x.SlotId.HasValue)).Select(x => x.SlotId.Value));
+                    await db.DeleteAsync<OrderItemsTable>(x => x.OrderId == order.OrderId);
+                    await db.DeleteAsync<OrderTable>(x => x.OrderId == order.OrderId);
                 }
 
-                RecalculateSpaces(db, occurrenceIds.Distinct());
-                RecalculateSlotUses(db, slotIds.Distinct());
+                await RecalculateSpaces(db, occurrenceIds.Distinct());
+                await RecalculateSlotUses(db, slotIds.Distinct());
             }
         }
 
-        public static bool AddLease(string clientId, Guid uuid, BrokerRole brokerRole, string brokerName, Uri brokerUrl, string brokerTelephone, long? sellerId, string customerEmail, DateTimeOffset leaseExpires, FakeDatabaseTransaction transaction)
+        public static async Task<bool> AddLease(string clientId, Guid uuid, BrokerRole brokerRole, string brokerName, Uri brokerUrl, string brokerTelephone, long? sellerId, string customerEmail, DateTimeOffset leaseExpires, FakeDatabaseTransaction transaction)
         {
             var db = transaction.DatabaseConnection;
 
-            var existingOrder = db.Single<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
+            var existingOrder = await db.SingleAsync<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
             if (existingOrder == null)
             {
-                db.Insert(new OrderTable
+                await db.InsertAsync(new OrderTable
                 {
                     ClientId = clientId,
                     OrderId = uuid.ToString(),
@@ -215,32 +223,29 @@ public static bool AddLease(string clientId, Guid uuid, BrokerRole brokerRole, s
                     LeaseExpires = leaseExpires.DateTime,
                     VisibleInOrdersFeed = FeedVisibility.None
                 });
+
                 return true;
             }
+
             // Return false if there's a clash with an existing Order or OrderProposal
-            else if (existingOrder.OrderMode != OrderMode.Lease || existingOrder.Deleted)
-            {
+            if (existingOrder.OrderMode != OrderMode.Lease || existingOrder.Deleted)
                 return false;
-            }
-            // Reuse existing lease if it exists
-            else
-            {
-                existingOrder.BrokerRole = brokerRole;
-                existingOrder.BrokerName = brokerName;
-                existingOrder.BrokerUrl = brokerUrl;
-                existingOrder.BrokerTelephone = brokerTelephone;
-                existingOrder.SellerId = sellerId ?? 1;
-                existingOrder.CustomerEmail = customerEmail;
-                existingOrder.OrderMode = OrderMode.Lease;
-                existingOrder.LeaseExpires = leaseExpires.DateTime;
-                db.Update(existingOrder);
-
-                // TODO: Remove this and improve leasing logic to add/update rather than delete/replace
-                // Remove previous lease
-                db.Delete<OrderItemsTable>(x => x.OrderId == existingOrder.OrderId);
 
-                return true;
-            }
+            // Reuse existing lease if it exists
+            existingOrder.BrokerRole = brokerRole;
+            existingOrder.BrokerName = brokerName;
+            existingOrder.BrokerUrl = brokerUrl;
+            existingOrder.BrokerTelephone = brokerTelephone;
+            existingOrder.SellerId = sellerId ?? 1;
+            existingOrder.CustomerEmail = customerEmail;
+            existingOrder.OrderMode = OrderMode.Lease;
+            existingOrder.LeaseExpires = leaseExpires.DateTime;
+            await db.UpdateAsync(existingOrder);
+
+            // TODO: Remove this and improve leasing logic to add/update rather than delete/replace
+            // Remove previous lease
+            await db.DeleteAsync<OrderItemsTable>(x => x.OrderId == existingOrder.OrderId);
+            return true;
         }
 
         /// <summary>
@@ -249,23 +254,21 @@ public static bool AddLease(string clientId, Guid uuid, BrokerRole brokerRole, s
         /// <param name="slotId"></param>
         /// <param name="newName"></param>
         /// <returns></returns>
-        public bool UpdateFacilityUseName(long slotId, string newName)
+        public async Task<bool> UpdateFacilityUseName(long slotId, string newName)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 var query = db.From<SlotTable>()
-                            .LeftJoin<SlotTable, FacilityUseTable>()
-                            .Where(x => x.Id == slotId)
-                            .And<FacilityUseTable>(y => !y.Deleted);
-                var facilityUse = db.Select<FacilityUseTable>(query).Single();
+                              .LeftJoin<SlotTable, FacilityUseTable>()
+                              .Where(x => x.Id == slotId)
+                              .And<FacilityUseTable>(y => !y.Deleted);
+                var facilityUse = (await db.SelectAsync<FacilityUseTable>(query)).Single();
                 if (facilityUse == null)
-                {
                     return false;
-                }
 
                 facilityUse.Name = newName;
                 facilityUse.Modified = DateTimeOffset.Now.UtcTicks;
-                db.Update(facilityUse);
+                await db.UpdateAsync(facilityUse);
                 return true;
             }
         }
@@ -276,20 +279,18 @@ public bool UpdateFacilityUseName(long slotId, string newName)
         /// <param name="slotId"></param>
         /// <param name="numberOfMins"></param>
         /// <returns></returns>
-        public bool UpdateFacilitySlotStartAndEndTimeByPeriodInMins(long slotId, int numberOfMins)
+        public async Task<bool> UpdateFacilitySlotStartAndEndTimeByPeriodInMins(long slotId, int numberOfMins)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var slot = db.Single<SlotTable>(x => x.Id == slotId && !x.Deleted);
+                var slot = await db.SingleAsync<SlotTable>(x => x.Id == slotId && !x.Deleted);
                 if (slot == null)
-                {
                     return false;
-                }
 
-                slot.Start.AddMinutes(numberOfMins);
-                slot.End.AddMinutes(numberOfMins);
+                slot.Start = slot.Start.AddMinutes(numberOfMins);
+                slot.End = slot.End.AddMinutes(numberOfMins);
                 slot.Modified = DateTimeOffset.Now.UtcTicks;
-                db.Update(slot);
+                await db.UpdateAsync(slot);
                 return true;
             }
         }
@@ -301,24 +302,22 @@ public bool UpdateFacilitySlotStartAndEndTimeByPeriodInMins(long slotId, int num
         /// <param name="newLat"></param>
         /// <param name="newLng"></param>
         /// <returns></returns>
-        public bool UpdateFacilityUseLocationLatLng(long slotId, decimal newLat, decimal newLng)
+        public async Task<bool> UpdateFacilityUseLocationLatLng(long slotId, decimal newLat, decimal newLng)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 var query = db.From<SlotTable>()
-                            .LeftJoin<SlotTable, FacilityUseTable>()
-                            .Where(x => x.Id == slotId)
-                            .And<FacilityUseTable>(y => !y.Deleted);
-                var facilityUse = db.Select<FacilityUseTable>(query).Single();
+                              .LeftJoin<SlotTable, FacilityUseTable>()
+                              .Where(x => x.Id == slotId)
+                              .And<FacilityUseTable>(y => !y.Deleted);
+                var facilityUse = (await db.SelectAsync<FacilityUseTable>(query)).Single();
                 if (facilityUse == null)
-                {
                     return false;
-                }
 
                 facilityUse.LocationLat = newLat;
                 facilityUse.LocationLng = newLng;
                 facilityUse.Modified = DateTimeOffset.Now.UtcTicks;
-                db.Update(facilityUse);
+                await db.UpdateAsync(facilityUse);
                 return true;
             }
         }
@@ -329,23 +328,21 @@ public bool UpdateFacilityUseLocationLatLng(long slotId, decimal newLat, decimal
         /// <param name="occurrenceId"></param>
         /// <param name="newTitle"></param>
         /// <returns></returns>
-        public bool UpdateClassTitle(long occurrenceId, string newTitle)
+        public async Task<bool> UpdateClassTitle(long occurrenceId, string newTitle)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 var query = db.From<OccurrenceTable>()
                             .LeftJoin<OccurrenceTable, ClassTable>()
                             .Where(x => x.Id == occurrenceId)
                             .And<ClassTable>(y => !y.Deleted);
-                var classInstance = db.Select<ClassTable>(query).Single();
+                var classInstance = await db.SingleAsync<ClassTable>(query);
                 if (classInstance == null)
-                {
                     return false;
-                }
 
                 classInstance.Title = newTitle;
                 classInstance.Modified = DateTimeOffset.Now.UtcTicks;
-                db.Update(classInstance);
+                await db.UpdateAsync(classInstance);
                 return true;
             }
         }
@@ -356,20 +353,18 @@ public bool UpdateClassTitle(long occurrenceId, string newTitle)
         /// <param name="occurrenceId"></param>
         /// <param name="numberOfMins"></param>
         /// <returns></returns>
-        public bool UpdateScheduledSessionStartAndEndTimeByPeriodInMins(long occurrenceId, int numberOfMins)
+        public async Task<bool> UpdateScheduledSessionStartAndEndTimeByPeriodInMins(long occurrenceId, int numberOfMins)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var occurrence = db.Single<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
+                var occurrence = await db.SingleAsync<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
                 if (occurrence == null)
-                {
                     return false;
-                }
 
-                occurrence.Start.AddMinutes(numberOfMins);
-                occurrence.End.AddMinutes(numberOfMins);
+                occurrence.Start = occurrence.Start.AddMinutes(numberOfMins);
+                occurrence.End = occurrence.End.AddMinutes(numberOfMins);
                 occurrence.Modified = DateTimeOffset.Now.UtcTicks;
-                db.Update(occurrence);
+                await db.UpdateAsync(occurrence);
                 return true;
             }
         }
@@ -381,42 +376,38 @@ public bool UpdateScheduledSessionStartAndEndTimeByPeriodInMins(long occurrenceI
         /// <param name="newLat"></param>
         /// <param name="newLng"></param>
         /// <returns></returns>
-        public bool UpdateSessionSeriesLocationLatLng(long occurrenceId, decimal newLat, decimal newLng)
+        public async Task<bool> UpdateSessionSeriesLocationLatLng(long occurrenceId, decimal newLat, decimal newLng)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 var query = db.From<OccurrenceTable>()
                             .LeftJoin<OccurrenceTable, ClassTable>()
                             .Where(x => x.Id == occurrenceId)
                             .And<ClassTable>(y => !y.Deleted);
-                var classInstance = db.Select<ClassTable>(query).Single();
+                var classInstance = await db.SingleAsync<ClassTable>(query);
                 if (classInstance == null)
-                {
                     return false;
-                }
 
                 classInstance.LocationLat = newLat;
                 classInstance.LocationLng = newLng;
                 classInstance.Modified = DateTimeOffset.Now.UtcTicks;
-                db.Update(classInstance);
+                await db.UpdateAsync(classInstance);
                 return true;
             }
         }
 
-        public bool UpdateAccess(Guid uuid, bool updateAccessPass = false, bool updateAccessCode = false, bool updateAccessChannel = false)
+        public async Task<bool> UpdateAccess(Guid uuid, bool updateAccessPass = false, bool updateAccessCode = false, bool updateAccessChannel = false)
         {
             if (!updateAccessPass && !updateAccessCode && !updateAccessChannel)
-            {
                 return false;
-            }
 
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                OrderTable order = db.Single<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
+                OrderTable order = await db.SingleAsync<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
 
                 if (order != null)
                 {
-                    List<OrderItemsTable> orderItems = db.Select<OrderItemsTable>(x => x.OrderId == order.OrderId);
+                    List<OrderItemsTable> orderItems = await db.SelectAsync<OrderItemsTable>(x => x.OrderId == order.OrderId);
 
                     foreach (OrderItemsTable orderItem in orderItems)
                     {
@@ -441,32 +432,30 @@ public bool UpdateAccess(Guid uuid, bool updateAccessPass = false, bool updateAc
                             }
 
                             orderItem.Modified = DateTimeOffset.Now.UtcTicks;
-                            db.Save(orderItem);
+                            await db.SaveAsync(orderItem);
                         }
                     }
 
                     order.OrderModified = DateTimeOffset.Now.UtcTicks;
                     order.VisibleInOrdersFeed = FeedVisibility.Visible;
-                    db.Update(order);
+                    await db.UpdateAsync(order);
 
                     return true;
                 }
-                else
-                {
-                    return false;
-                }
+
+                return false;
             }
         }
 
-        public bool UpdateOpportunityAttendance(Guid uuid, bool attended)
+        public async Task<bool> UpdateOpportunityAttendance(Guid uuid, bool attended)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                OrderTable order = db.Single<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
+                OrderTable order = await db.SingleAsync<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
 
                 if (order != null)
                 {
-                    List<OrderItemsTable> orderItems = db.Select<OrderItemsTable>(x => x.OrderId == order.OrderId);
+                    List<OrderItemsTable> orderItems = await db.SelectAsync<OrderItemsTable>(x => x.OrderId == order.OrderId);
 
                     foreach (OrderItemsTable orderItem in orderItems)
                     {
@@ -474,75 +463,71 @@ public bool UpdateOpportunityAttendance(Guid uuid, bool attended)
                         {
                             orderItem.Status = attended ? BookingStatus.Attended : BookingStatus.Absent;
                             orderItem.Modified = DateTimeOffset.Now.UtcTicks;
-                            db.Update(orderItem);
+                            await db.UpdateAsync(orderItem);
                         }
                     }
 
                     order.OrderModified = DateTimeOffset.Now.UtcTicks;
                     order.VisibleInOrdersFeed = FeedVisibility.Visible;
-                    db.Update(order);
+                    await db.UpdateAsync(order);
 
                     return true;
                 }
-                else
-                {
-                    return false;
-                }
+
+                return false;
             }
         }
 
-        public bool AddCustomerNotice(Guid uuid)
+        public async Task<bool> AddCustomerNotice(Guid uuid)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                OrderTable order = db.Single<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
+                OrderTable order = await db.SingleAsync<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
                 if (order != null)
                 {
-                    List<OrderItemsTable> orderItems = db.Select<OrderItemsTable>(x => x.OrderId == order.OrderId);
+                    List<OrderItemsTable> orderItems = await db.SelectAsync<OrderItemsTable>(x => x.OrderId == order.OrderId);
                     foreach (OrderItemsTable orderItem in orderItems)
                     {
                         if (orderItem.Status == BookingStatus.Confirmed || orderItem.Status == BookingStatus.None)
                         {
                             orderItem.CustomerNotice = $"customer notice message: {Faker.Random.String(10, minChar: 'a', maxChar: 'z')}";
                             orderItem.Modified = DateTimeOffset.Now.UtcTicks;
-                            db.Update(orderItem);
+                            await db.UpdateAsync(orderItem);
                         }
                     }
 
                     order.OrderModified = DateTimeOffset.Now.UtcTicks;
                     order.VisibleInOrdersFeed = FeedVisibility.Visible;
-                    db.Update(order);
+                    await db.UpdateAsync(order);
 
                     return true;
                 }
-                else
-                {
-                    return false;
-                }
+
+                return false;
             }
         }
 
-        public void DeleteLease(string clientId, Guid uuid, long? sellerId)
+        public async Task DeleteLease(string clientId, Guid uuid, long? sellerId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 // TODO: Note this should throw an error if the Seller ID does not match, same as DeleteOrder
-                if (db.Exists<OrderTable>(x => x.ClientId == clientId && x.OrderMode == OrderMode.Lease && x.OrderId == uuid.ToString() && (!sellerId.HasValue || x.SellerId == sellerId)))
+                if (await db.ExistsAsync<OrderTable>(x => x.ClientId == clientId && x.OrderMode == OrderMode.Lease && x.OrderId == uuid.ToString() && (!sellerId.HasValue || x.SellerId == sellerId)))
                 {
                     // ReSharper disable twice PossibleInvalidOperationException
-                    var occurrenceIds = db.Select<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct();
-                    var slotIds = db.Select<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct();
+                    var occurrenceIds = (await db.SelectAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OccurrenceId.HasValue)).Select(x => x.OccurrenceId.Value).Distinct();
+                    var slotIds = (await db.SelectAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.SlotId.HasValue)).Select(x => x.SlotId.Value).Distinct();
 
-                    db.Delete<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
-                    db.Delete<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
+                    await db.DeleteAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
+                    await db.DeleteAsync<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
 
-                    RecalculateSpaces(db, occurrenceIds);
-                    RecalculateSlotUses(db, slotIds);
+                    await RecalculateSpaces(db, occurrenceIds);
+                    await RecalculateSlotUses(db, slotIds);
                 }
             }
         }
 
-        public static bool AddOrder(
+        public static async Task<bool> AddOrder(
             string clientId, Guid uuid, BrokerRole brokerRole, string brokerName, Uri brokerUrl, string brokerTelephone, long? sellerId,
             string customerEmail, CustomerType customerType, string customerOrganizationName,
             string customerIdentifier, string customerGivenName, string customerFamilyName, string customerTelephone,
@@ -551,10 +536,10 @@ public static bool AddOrder(
         {
             var db = transaction.DatabaseConnection;
 
-            var existingOrder = db.Single<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
+            var existingOrder = await db.SingleAsync<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
             if (existingOrder == null)
             {
-                db.Insert(new OrderTable
+                await db.InsertAsync(new OrderTable
                 {
                     ClientId = clientId,
                     OrderId = uuid.ToString(),
@@ -584,69 +569,65 @@ public static bool AddOrder(
                 return true;
             }
             // Return false if there's a clash with an existing Order or OrderProposal
-            else if (existingOrder.OrderMode != OrderMode.Lease || existingOrder.Deleted)
+
+            if (existingOrder.OrderMode != OrderMode.Lease || existingOrder.Deleted)
             {
                 return false;
             }
             // Reuse existing lease if it exists
-            else
-            {
-                existingOrder.BrokerRole = brokerRole;
-                existingOrder.BrokerName = brokerName;
-                existingOrder.BrokerUrl = brokerUrl;
-                existingOrder.BrokerTelephone = brokerTelephone;
-                existingOrder.SellerId = sellerId ?? 1;
-                existingOrder.CustomerEmail = customerEmail;
-                existingOrder.CustomerType = customerType;
-                existingOrder.CustomerOrganizationName = customerOrganizationName;
-                existingOrder.CustomerIdentifier = customerIdentifier;
-                existingOrder.CustomerGivenName = customerGivenName;
-                existingOrder.CustomerFamilyName = customerFamilyName;
-                existingOrder.CustomerTelephone = customerTelephone;
-                existingOrder.PaymentIdentifier = paymentIdentifier;
-                existingOrder.PaymentName = paymentName;
-                existingOrder.PaymentProviderId = paymentProviderId;
-                existingOrder.PaymentAccountId = paymentAccountId;
-                existingOrder.TotalOrderPrice = totalOrderPrice;
-                existingOrder.OrderMode = proposalVersionUuid != null ? OrderMode.Proposal : OrderMode.Booking;
-                existingOrder.ProposalVersionId = proposalVersionUuid;
-                existingOrder.ProposalStatus = proposalStatus;
-                db.Update(existingOrder);
-
-                return true;
-            }
-        }
-
-        public (FakeDatabaseGetOrderResult, OrderTable, List<OrderItemsTable>) GetOrderAndOrderItems(string clientId, long? sellerId, Guid uuid)
-        {
-            using (var db = Mem.Database.Open())
-            {
-                var order = db.Single<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && !x.Deleted && (!sellerId.HasValue || x.SellerId == sellerId));
+            existingOrder.BrokerRole = brokerRole;
+            existingOrder.BrokerName = brokerName;
+            existingOrder.BrokerUrl = brokerUrl;
+            existingOrder.BrokerTelephone = brokerTelephone;
+            existingOrder.SellerId = sellerId ?? 1;
+            existingOrder.CustomerEmail = customerEmail;
+            existingOrder.CustomerType = customerType;
+            existingOrder.CustomerOrganizationName = customerOrganizationName;
+            existingOrder.CustomerIdentifier = customerIdentifier;
+            existingOrder.CustomerGivenName = customerGivenName;
+            existingOrder.CustomerFamilyName = customerFamilyName;
+            existingOrder.CustomerTelephone = customerTelephone;
+            existingOrder.PaymentIdentifier = paymentIdentifier;
+            existingOrder.PaymentName = paymentName;
+            existingOrder.PaymentProviderId = paymentProviderId;
+            existingOrder.PaymentAccountId = paymentAccountId;
+            existingOrder.TotalOrderPrice = totalOrderPrice;
+            existingOrder.OrderMode = proposalVersionUuid != null ? OrderMode.Proposal : OrderMode.Booking;
+            existingOrder.ProposalVersionId = proposalVersionUuid;
+            existingOrder.ProposalStatus = proposalStatus;
+            await db.UpdateAsync(existingOrder);
+
+            return true;
+        }
+
+        public async Task<(FakeDatabaseGetOrderResult, OrderTable, List<OrderItemsTable>)> GetOrderAndOrderItems(string clientId, long? sellerId, Guid uuid)
+        {
+            using (var db = await Mem.Database.OpenAsync())
+            {
+                var order = await db.SingleAsync<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && !x.Deleted && (!sellerId.HasValue || x.SellerId == sellerId));
                 if (order == null) return (FakeDatabaseGetOrderResult.OrderWasNotFound, null, null);
-                var orderItems = db.Select<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
+                var orderItems = await db.SelectAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString());
                 if (orderItems.Count == 0) return (FakeDatabaseGetOrderResult.OrderWasNotFound, null, null);
 
                 return (FakeDatabaseGetOrderResult.OrderSuccessfullyGot, order, orderItems);
             }
         }
 
-        public (bool, ClassTable, OccurrenceTable, BookedOrderItemInfo) GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(Guid uuid, long? occurrenceId)
+        public async Task<(bool, ClassTable, OccurrenceTable, BookedOrderItemInfo)> GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(Guid uuid, long? occurrenceId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 var query = db.From<OccurrenceTable>()
                     .LeftJoin<OccurrenceTable, ClassTable>()
-                    .Where((x) => x.Id == occurrenceId);
+                    .Where(x => x.Id == occurrenceId);
                 var rows = db.SelectMulti<OccurrenceTable, ClassTable>(query);
-                var hasFoundOccurrence = false;
                 if (!rows.Any())
-                {
-                    return (hasFoundOccurrence, null, null, null);
-                }
+                    return (true, null, null, null);
+
                 var (occurrence, thisClass) = rows.FirstOrDefault();
 
-                var orderItem = db.Single<OrderItemsTable>(x => x.OrderId == uuid.ToString() && x.OccurrenceId == occurrenceId);
-                var bookedOrderItemInfo = (orderItem != null && orderItem.Status == BookingStatus.Confirmed) ?
+                var orderItem = await db.SingleAsync<OrderItemsTable>(x => x.OrderId == uuid.ToString() && x.OccurrenceId == occurrenceId);
+                var bookedOrderItemInfo = orderItem != null && orderItem.Status == BookingStatus.Confirmed ?
                      new BookedOrderItemInfo
                      {
                          OrderItemId = orderItem.Id,
@@ -659,9 +640,8 @@ public static bool AddOrder(
                      }
                      : null;
 
-                hasFoundOccurrence = true;
                 return (
-                    hasFoundOccurrence,
+                    true,
                     thisClass,
                     occurrence,
                     bookedOrderItemInfo
@@ -669,21 +649,19 @@ public static bool AddOrder(
             }
         }
 
-        public (bool, FacilityUseTable, SlotTable, BookedOrderItemInfo) GetSlotAndBookedOrderItemInfoBySlotId(Guid uuid, long? slotId)
+        public async Task<(bool, FacilityUseTable, SlotTable, BookedOrderItemInfo)> GetSlotAndBookedOrderItemInfoBySlotId(Guid uuid, long? slotId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 var query = db.From<SlotTable>()
                     .LeftJoin<SlotTable, FacilityUseTable>()
-                    .Where((x) => x.Id == slotId);
+                    .Where(x => x.Id == slotId);
                 var rows = db.SelectMulti<SlotTable, FacilityUseTable>(query);
-                var hasFoundOccurrence = false;
                 if (!rows.Any())
-                {
-                    return (hasFoundOccurrence, null, null, null);
-                }
+                    return (false, null, null, null);
+
                 var (slot, facilityUse) = rows.FirstOrDefault();
-                var orderItem = db.Single<OrderItemsTable>(x => x.OrderId == uuid.ToString() && x.SlotId == slotId);
+                var orderItem = await db.SingleAsync<OrderItemsTable>(x => x.OrderId == uuid.ToString() && x.SlotId == slotId);
                 var bookedOrderItemInfo = (orderItem != null && orderItem.Status == BookingStatus.Confirmed) ?
                      new BookedOrderItemInfo
                      {
@@ -694,9 +672,8 @@ public static bool AddOrder(
                      }
                      : null;
 
-                hasFoundOccurrence = true;
                 return (
-                    hasFoundOccurrence,
+                    true,
                     facilityUse,
                     slot,
                     bookedOrderItemInfo
@@ -704,12 +681,12 @@ public static bool AddOrder(
             }
         }
 
-        public FakeDatabaseDeleteOrderResult DeleteOrder(string clientId, Guid uuid, long? sellerId)
+        public async Task<FakeDatabaseDeleteOrderResult> DeleteOrder(string clientId, Guid uuid, long? sellerId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 // Set the Order to deleted in the feed, and erase all associated personal data
-                var order = db.Single<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OrderMode != OrderMode.Lease);
+                var order = await db.SingleAsync<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OrderMode != OrderMode.Lease);
                 if (order == null)
                 {
                     return FakeDatabaseDeleteOrderResult.OrderWasNotFound;
@@ -725,24 +702,24 @@ public FakeDatabaseDeleteOrderResult DeleteOrder(string clientId, Guid uuid, lon
                 order.Deleted = true;
                 order.CustomerEmail = null;
                 order.OrderModified = DateTimeOffset.Now.UtcTicks;
-                db.Update(order);
+                await db.UpdateAsync(order);
 
-                var occurrenceIds = db.Select<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == order.OrderId && x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct();
-                var slotIds = db.Select<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct();
-                db.Delete<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == order.OrderId);
+                var occurrenceIds = (await db.SelectAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == order.OrderId && x.OccurrenceId.HasValue)).Select(x => x.OccurrenceId.Value).Distinct();
+                var slotIds = (await db.SelectAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.SlotId.HasValue)).Select(x => x.SlotId.Value).Distinct();
+                await db.DeleteAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == order.OrderId);
 
-                RecalculateSpaces(db, occurrenceIds);
-                RecalculateSlotUses(db, slotIds);
+                await RecalculateSpaces(db, occurrenceIds);
+                await RecalculateSlotUses(db, slotIds);
 
                 return FakeDatabaseDeleteOrderResult.OrderSuccessfullyDeleted;
             }
         }
 
-        public static (ReserveOrderItemsResult, long?, long?) LeaseOrderItemsForClassOccurrence(FakeDatabaseTransaction transaction, string clientId, long? sellerId, Guid uuid, long occurrenceId, long spacesRequested)
+        public static async Task<(ReserveOrderItemsResult, long?, long?)> LeaseOrderItemsForClassOccurrence(FakeDatabaseTransaction transaction, string clientId, long? sellerId, Guid uuid, long occurrenceId, long spacesRequested)
         {
             var db = transaction.DatabaseConnection;
-            var thisOccurrence = db.Single<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
-            var thisClass = db.Single<ClassTable>(x => x.Id == thisOccurrence.ClassId && !x.Deleted);
+            var thisOccurrence = await db.SingleAsync<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
+            var thisClass = await db.SingleAsync<ClassTable>(x => x.Id == thisOccurrence.ClassId && !x.Deleted);
 
             if (thisOccurrence == null || thisClass == null)
                 return (ReserveOrderItemsResult.OpportunityNotFound, null, null);
@@ -755,8 +732,8 @@ public static (ReserveOrderItemsResult, long?, long?) LeaseOrderItemsForClassOcc
 
             // Remove existing leases
             // Note a real implementation would likely maintain existing leases instead of removing and recreating them
-            db.Delete<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OccurrenceId == occurrenceId);
-            RecalculateSpaces(db, thisOccurrence);
+            await db.DeleteAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OccurrenceId == occurrenceId);
+            await RecalculateSpaces(db, thisOccurrence);
 
             // Only lease if all spaces requested are available
             if (thisOccurrence.RemainingSpaces - thisOccurrence.LeasedSpaces < spacesRequested)
@@ -769,7 +746,7 @@ public static (ReserveOrderItemsResult, long?, long?) LeaseOrderItemsForClassOcc
 
             for (var i = 0; i < spacesRequested; i++)
             {
-                db.Insert(new OrderItemsTable
+                await db.InsertAsync(new OrderItemsTable
                 {
                     ClientId = clientId,
                     Deleted = false,
@@ -780,15 +757,15 @@ public static (ReserveOrderItemsResult, long?, long?) LeaseOrderItemsForClassOcc
             }
 
             // Update number of spaces remaining for the opportunity
-            RecalculateSpaces(db, thisOccurrence);
+            await RecalculateSpaces(db, thisOccurrence);
             return (ReserveOrderItemsResult.Success, null, null);
         }
 
-        public static (ReserveOrderItemsResult, long?, long?) LeaseOrderItemsForFacilitySlot(FakeDatabaseTransaction transaction, string clientId, long? sellerId, Guid uuid, long slotId, long spacesRequested)
+        public static async Task<(ReserveOrderItemsResult, long?, long?)> LeaseOrderItemsForFacilitySlot(FakeDatabaseTransaction transaction, string clientId, long? sellerId, Guid uuid, long slotId, long spacesRequested)
         {
             var db = transaction.DatabaseConnection;
-            var thisSlot = db.Single<SlotTable>(x => x.Id == slotId && !x.Deleted);
-            var thisFacility = db.Single<FacilityUseTable>(x => x.Id == thisSlot.FacilityUseId && !x.Deleted);
+            var thisSlot = await db.SingleAsync<SlotTable>(x => x.Id == slotId && !x.Deleted);
+            var thisFacility = await db.SingleAsync<FacilityUseTable>(x => x.Id == thisSlot.FacilityUseId && !x.Deleted);
 
             if (thisSlot == null || thisFacility == null)
                 return (ReserveOrderItemsResult.OpportunityNotFound, null, null);
@@ -801,8 +778,8 @@ public static (ReserveOrderItemsResult, long?, long?) LeaseOrderItemsForFacility
 
             // Remove existing leases
             // Note a real implementation would likely maintain existing leases instead of removing and recreating them
-            db.Delete<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.SlotId == slotId);
-            RecalculateSlotUses(db, thisSlot);
+            await db.DeleteAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.SlotId == slotId);
+            await RecalculateSlotUses(db, thisSlot);
 
             // Only lease if all spaces requested are available
             if (thisSlot.RemainingUses - thisSlot.LeasedUses < spacesRequested)
@@ -815,7 +792,7 @@ public static (ReserveOrderItemsResult, long?, long?) LeaseOrderItemsForFacility
 
             for (var i = 0; i < spacesRequested; i++)
             {
-                db.Insert(new OrderItemsTable
+                await db.InsertAsync(new OrderItemsTable
                 {
                     ClientId = clientId,
                     Deleted = false,
@@ -826,7 +803,7 @@ public static (ReserveOrderItemsResult, long?, long?) LeaseOrderItemsForFacility
             }
 
             // Update number of spaces remaining for the opportunity
-            RecalculateSlotUses(db, thisSlot);
+            await RecalculateSlotUses(db, thisSlot);
             return (ReserveOrderItemsResult.Success, null, null);
         }
 
@@ -843,7 +820,7 @@ public class BookedOrderItemInfo
         }
 
         // TODO this should reuse code of LeaseOrderItemsForClassOccurrence
-        public static (ReserveOrderItemsResult, List<BookedOrderItemInfo>) BookOrderItemsForClassOccurrence(
+        public static async Task<(ReserveOrderItemsResult, List<BookedOrderItemInfo>)> BookOrderItemsForClassOccurrence(
             FakeDatabaseTransaction transaction,
             string clientId,
             long? sellerId,
@@ -856,8 +833,8 @@ bool proposal
             )
         {
             var db = transaction.DatabaseConnection;
-            var thisOccurrence = db.Single<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
-            var thisClass = db.Single<ClassTable>(x => x.Id == thisOccurrence.ClassId && !x.Deleted);
+            var thisOccurrence = await db.SingleAsync<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
+            var thisClass = await db.SingleAsync<ClassTable>(x => x.Id == thisOccurrence.ClassId && !x.Deleted);
 
             if (thisOccurrence == null || thisClass == null)
                 return (ReserveOrderItemsResult.OpportunityNotFound, null);
@@ -870,8 +847,8 @@ bool proposal
 
             // Remove existing leases
             // Note a real implementation would likely maintain existing leases instead of removing and recreating them
-            db.Delete<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OccurrenceId == occurrenceId);
-            RecalculateSpaces(db, thisOccurrence);
+            await db.DeleteAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OccurrenceId == occurrenceId);
+            await RecalculateSpaces(db, thisOccurrence);
 
             // Only lease if all spaces requested are available
             if (thisOccurrence.RemainingSpaces - thisOccurrence.LeasedSpaces < numberOfSpaces)
@@ -898,7 +875,7 @@ bool proposal
                     MeetingId = thisClass.AttendanceMode != AttendanceMode.Offline ? Faker.Random.String(length: 10, minChar: '0', maxChar: '9') : null,
                     MeetingPassword = thisClass.AttendanceMode != AttendanceMode.Offline ? Faker.Random.String(length: 10, minChar: '0', maxChar: '9') : null
                 };
-                db.Save(orderItem);
+                await db.SaveAsync(orderItem);
                 bookedOrderItemInfos.Add(new BookedOrderItemInfo
                 {
                     OrderItemId = orderItem.Id,
@@ -911,12 +888,12 @@ bool proposal
                 });
             }
 
-            RecalculateSpaces(db, thisOccurrence);
+            await RecalculateSpaces(db, thisOccurrence);
             return (ReserveOrderItemsResult.Success, bookedOrderItemInfos);
         }
 
         // TODO this should reuse code of LeaseOrderItemsForFacilityOccurrence
-        public static (ReserveOrderItemsResult, List<BookedOrderItemInfo>) BookOrderItemsForFacilitySlot(
+        public static async Task<(ReserveOrderItemsResult, List<BookedOrderItemInfo>)> BookOrderItemsForFacilitySlot(
             FakeDatabaseTransaction transaction,
             string clientId,
             long? sellerId,
@@ -929,8 +906,8 @@ bool proposal
             )
         {
             var db = transaction.DatabaseConnection;
-            var thisSlot = db.Single<SlotTable>(x => x.Id == slotId && !x.Deleted);
-            var thisFacility = db.Single<FacilityUseTable>(x => x.Id == thisSlot.FacilityUseId && !x.Deleted);
+            var thisSlot = await db.SingleAsync<SlotTable>(x => x.Id == slotId && !x.Deleted);
+            var thisFacility = await db.SingleAsync<FacilityUseTable>(x => x.Id == thisSlot.FacilityUseId && !x.Deleted);
 
             if (thisSlot == null || thisFacility == null)
                 return (ReserveOrderItemsResult.OpportunityNotFound, null);
@@ -943,8 +920,8 @@ bool proposal
 
             // Remove existing leases
             // Note a real implementation would likely maintain existing leases instead of removing and recreating them
-            db.Delete<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.SlotId == slotId);
-            RecalculateSlotUses(db, thisSlot);
+            await db.DeleteAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.SlotId == slotId);
+            await RecalculateSlotUses(db, thisSlot);
 
             // Only lease if all spaces requested are available
             if (thisSlot.RemainingUses - thisSlot.LeasedUses < numberOfSpaces)
@@ -969,7 +946,7 @@ bool proposal
                     BarCodeText = Faker.Random.String(length: 10, minChar: '0', maxChar: '9')
                 };
 
-                db.Save(orderItem);
+                await db.SaveAsync(orderItem);
 
                 bookedOrderItemInfos.Add(new BookedOrderItemInfo
                 {
@@ -980,18 +957,18 @@ bool proposal
                 });
             }
 
-            RecalculateSlotUses(db, thisSlot);
+            await RecalculateSlotUses(db, thisSlot);
             return (ReserveOrderItemsResult.Success, bookedOrderItemInfos);
         }
 
-        public bool CancelOrderItems(string clientId, long? sellerId, Guid uuid, List<long> orderItemIds, bool customerCancelled, bool includeCancellationMessage = false)
+        public async Task<bool> CancelOrderItems(string clientId, long? sellerId, Guid uuid, List<long> orderItemIds, bool customerCancelled, bool includeCancellationMessage = false)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
             {
                 var order = customerCancelled
-                    ? db.Single<OrderTable>(x => x.ClientId == clientId && x.OrderMode == OrderMode.Booking && x.OrderId == uuid.ToString() && !x.Deleted)
-                    : db.Single<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
+                    ? await db.SingleAsync<OrderTable>(x => x.ClientId == clientId && x.OrderMode == OrderMode.Booking && x.OrderId == uuid.ToString() && !x.Deleted)
+                    : await db.SingleAsync<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
 
                 if (order == null)
                     return false;
@@ -1053,11 +1030,9 @@ public bool CancelOrderItems(string clientId, long? sellerId, Guid uuid, List<lo
                             // If the customer has already cancelled this OrderItem, do nothing to maintain idempotency
                             continue;
                         }
-                        else
-                        {
-                            orderItem.Status = BookingStatus.CustomerCancelled;
-                            updatedOrderItems.Add(orderItem);
-                        }
+
+                        orderItem.Status = BookingStatus.CustomerCancelled;
+                        updatedOrderItems.Add(orderItem);
 
                     }
                     else
@@ -1069,26 +1044,26 @@ public bool CancelOrderItems(string clientId, long? sellerId, Guid uuid, List<lo
                             orderItem.CancellationMessage = "Order cancelled by seller";
                     }
 
-                    db.Save(orderItem);
+                    await db.SaveAsync(orderItem);
                 }
 
                 // Update the total price and modified date on the Order to update the feed, if something has changed
                 // This makes the call idempotent
                 if (updatedOrderItems.Count > 0)
                 {
-                    var totalPrice = db.Select<OrderItemsTable>(x =>
+                    var totalPrice = (await db.SelectAsync<OrderItemsTable>(x =>
                         x.ClientId == clientId && x.OrderId == order.OrderId &&
-                        (x.Status == BookingStatus.Confirmed || x.Status == BookingStatus.Attended || x.Status == BookingStatus.Absent)).Sum(x => x.Price);
+                        (x.Status == BookingStatus.Confirmed || x.Status == BookingStatus.Attended || x.Status == BookingStatus.Absent))).Sum(x => x.Price);
 
                     order.TotalOrderPrice = totalPrice;
                     order.VisibleInOrdersFeed = FeedVisibility.Visible;
                     order.OrderModified = DateTimeOffset.Now.UtcTicks;
-                    db.Update(order);
+                    await db.UpdateAsync(order);
 
                     // Note an actual implementation would need to handle different opportunity types here
                     // Update the number of spaces available as a result of cancellation
-                    RecalculateSpaces(db, updatedOrderItems.Where(x => x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct());
-                    RecalculateSlotUses(db, updatedOrderItems.Where(x => x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct());
+                    await RecalculateSpaces(db, updatedOrderItems.Where(x => x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct());
+                    await RecalculateSlotUses(db, updatedOrderItems.Where(x => x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct());
                 }
 
                 transaction.Commit();
@@ -1096,9 +1071,9 @@ public bool CancelOrderItems(string clientId, long? sellerId, Guid uuid, List<lo
             }
         }
 
-        public bool ReplaceOrderOpportunity(Guid uuid)
+        public async Task<bool> ReplaceOrderOpportunity(Guid uuid)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 var query = db.From<OrderItemsTable>()
                               .Join<OrderTable>()
@@ -1108,7 +1083,7 @@ public bool ReplaceOrderOpportunity(Guid uuid)
                 if (!orderItemsAndOrder.Any())
                     return false;
                 var order = orderItemsAndOrder.First().Item2;
-                var orderItems = orderItemsAndOrder.Select(x => x.Item1);
+                var orderItems = orderItemsAndOrder.Select(x => x.Item1).AsList();
 
                 var index = Faker.Random.Int(0, orderItemsAndOrder.Count - 1);
                 var orderItem = orderItemsAndOrder[index].Item1;
@@ -1158,26 +1133,26 @@ public bool ReplaceOrderOpportunity(Guid uuid)
                     return false;
                 }
 
-                db.Update(orderItem);
+                await db.UpdateAsync(orderItem);
 
-                order.TotalOrderPrice = orderItems.Sum(x => x.Price); ;
+                order.TotalOrderPrice = orderItems.Sum(x => x.Price);
                 order.VisibleInOrdersFeed = FeedVisibility.Visible;
                 order.OrderModified = DateTimeOffset.Now.UtcTicks;
-                db.Update(order);
+                await db.UpdateAsync(order);
 
                 // Note an actual implementation would need to handle different opportunity types here
                 // Update the number of spaces available as a result of cancellation
-                RecalculateSpaces(db, orderItems.Where(x => x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct());
-                RecalculateSlotUses(db, orderItems.Where(x => x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct());
+                await RecalculateSpaces(db, orderItems.Where(x => x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct());
+                await RecalculateSlotUses(db, orderItems.Where(x => x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct());
                 return true;
             }
         }
 
-        public bool AcceptOrderProposal(Guid uuid)
+        public async Task<bool> AcceptOrderProposal(Guid uuid)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var order = db.Single<OrderTable>(x => x.OrderMode == OrderMode.Proposal && x.OrderId == uuid.ToString() && !x.Deleted);
+                var order = await db.SingleAsync<OrderTable>(x => x.OrderMode == OrderMode.Proposal && x.OrderId == uuid.ToString() && !x.Deleted);
                 if (order != null)
                 {
                     // This makes the call idempotent
@@ -1187,21 +1162,19 @@ public bool AcceptOrderProposal(Guid uuid)
                         order.ProposalStatus = ProposalStatus.SellerAccepted;
                         order.VisibleInOrderProposalsFeed = FeedVisibility.Visible;
                         order.OrderProposalModified = DateTimeOffset.Now.UtcTicks;
-                        db.Update(order);
+                        await db.UpdateAsync(order);
                     }
                     return true;
                 }
-                else
-                {
-                    return false;
-                }
+
+                return false;
             }
         }
-        public bool AmendOrderProposal(Guid uuid, Guid version)
+        public async Task<bool> AmendOrderProposal(Guid uuid, Guid version)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var order = db.Single<OrderTable>(x => x.OrderMode == OrderMode.Proposal && x.OrderId == uuid.ToString() && !x.Deleted);
+                var order = await db.SingleAsync<OrderTable>(x => x.OrderMode == OrderMode.Proposal && x.OrderId == uuid.ToString() && !x.Deleted);
                 if (order != null)
                 {
                     // This makes the call idempotent
@@ -1211,23 +1184,21 @@ public bool AmendOrderProposal(Guid uuid, Guid version)
                         order.ProposalVersionId = version;
                         order.VisibleInOrderProposalsFeed = FeedVisibility.Visible;
                         order.OrderProposalModified = DateTimeOffset.Now.UtcTicks;
-                        db.Update(order);
+                        await db.UpdateAsync(order);
                     }
                     return true;
                 }
-                else
-                {
-                    return false;
-                }
+
+                return false;
             }
         }
 
-        public FakeDatabaseBookOrderProposalResult BookOrderProposal(string clientId, long? sellerId, Guid uuid, Guid? proposalVersionUuid)
+        public async Task<FakeDatabaseBookOrderProposalResult> BookOrderProposal(string clientId, long? sellerId, Guid uuid, Guid? proposalVersionUuid)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 // Note call is idempotent, so it might already be in the booked state
-                var order = db.Single<OrderTable>(x => x.ClientId == clientId && (x.OrderMode == OrderMode.Proposal || x.OrderMode == OrderMode.Booking) && x.OrderId == uuid.ToString() && !x.Deleted);
+                var order = await db.SingleAsync<OrderTable>(x => x.ClientId == clientId && (x.OrderMode == OrderMode.Proposal || x.OrderMode == OrderMode.Booking) && x.OrderId == uuid.ToString() && !x.Deleted);
                 if (order != null)
                 {
                     if (sellerId.HasValue && order.SellerId != sellerId)
@@ -1243,13 +1214,13 @@ public FakeDatabaseBookOrderProposalResult BookOrderProposal(string clientId, lo
                         return FakeDatabaseBookOrderProposalResult.OrderProposalNotAccepted;
                     }
                     List<OrderItemsTable> updatedOrderItems = new List<OrderItemsTable>();
-                    foreach (OrderItemsTable orderItem in db.Select<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == order.OrderId))
+                    foreach (OrderItemsTable orderItem in await db.SelectAsync<OrderItemsTable>(x => x.ClientId == clientId && x.OrderId == order.OrderId))
                     {
                         if (orderItem.Status != BookingStatus.Confirmed)
                         {
                             updatedOrderItems.Add(orderItem);
                             orderItem.Status = BookingStatus.Confirmed;
-                            db.Save(orderItem);
+                            await db.SaveAsync(orderItem);
                         }
                     }
                     // Update the status and modified date of the OrderProposal to update the feed, if something has changed
@@ -1259,24 +1230,22 @@ public FakeDatabaseBookOrderProposalResult BookOrderProposal(string clientId, lo
                         order.OrderMode = OrderMode.Booking;
                         order.VisibleInOrderProposalsFeed = FeedVisibility.Archived;
                         order.OrderProposalModified = DateTimeOffset.Now.UtcTicks;
-                        db.Update(order);
+                        await db.UpdateAsync(order);
                         // Note an actual implementation would need to handle different opportunity types here
                         // Update the number of spaces available as a result of cancellation
-                        RecalculateSpaces(db, updatedOrderItems.Where(x => x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct());
-                        RecalculateSlotUses(db, updatedOrderItems.Where(x => x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct());
+                        await RecalculateSpaces(db, updatedOrderItems.Where(x => x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct());
+                        await RecalculateSlotUses(db, updatedOrderItems.Where(x => x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct());
                     }
                     return FakeDatabaseBookOrderProposalResult.OrderSuccessfullyBooked;
                 }
-                else
-                {
-                    return FakeDatabaseBookOrderProposalResult.OrderWasNotFound;
-                }
+
+                return FakeDatabaseBookOrderProposalResult.OrderWasNotFound;
             }
         }
 
-        public long GetNumberOfOtherLeaseForOccurrence(Guid uuid, long? occurrenceId)
+        public async Task<long> GetNumberOfOtherLeaseForOccurrence(Guid uuid, long? occurrenceId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 return db.Count<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking &&
                                                  x.OrderTable.ProposalStatus != ProposalStatus.CustomerRejected &&
@@ -1286,9 +1255,9 @@ public long GetNumberOfOtherLeaseForOccurrence(Guid uuid, long? occurrenceId)
             }
         }
 
-        public long GetNumberOfOtherLeasesForSlot(Guid uuid, long? slotId)
+        public async Task<long> GetNumberOfOtherLeasesForSlot(Guid uuid, long? slotId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
                 return db.Count<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking &&
                                                  x.OrderTable.ProposalStatus != ProposalStatus.CustomerRejected &&
@@ -1298,11 +1267,11 @@ public long GetNumberOfOtherLeasesForSlot(Guid uuid, long? slotId)
             }
         }
 
-        public bool RejectOrderProposal(string clientId, long? sellerId, Guid uuid, bool customerRejected)
+        public async Task<bool> RejectOrderProposal(string clientId, long? sellerId, Guid uuid, bool customerRejected)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var order = db.Single<OrderTable>(x => (clientId == null || x.ClientId == clientId) && x.OrderMode == OrderMode.Proposal && x.OrderId == uuid.ToString() && !x.Deleted);
+                var order = await db.SingleAsync<OrderTable>(x => (clientId == null || x.ClientId == clientId) && x.OrderMode == OrderMode.Proposal && x.OrderId == uuid.ToString() && !x.Deleted);
                 if (order != null)
                 {
                     if (sellerId.HasValue && order.SellerId != sellerId)
@@ -1315,95 +1284,94 @@ public bool RejectOrderProposal(string clientId, long? sellerId, Guid uuid, bool
                         order.ProposalStatus = customerRejected ? ProposalStatus.CustomerRejected : ProposalStatus.SellerRejected;
                         order.VisibleInOrderProposalsFeed = FeedVisibility.Visible;
                         order.OrderProposalModified = DateTimeOffset.Now.UtcTicks;
-                        db.Update(order);
+                        await db.UpdateAsync(order);
                         // Note an actual implementation would need to handle different opportunity types here
                         // Update the number of spaces available as a result of cancellation
-                        List<OrderItemsTable> updatedOrderItems = db.Select<OrderItemsTable>(x => (clientId == null || x.ClientId == clientId) && x.OrderId == order.OrderId).ToList();
-                        RecalculateSpaces(db, updatedOrderItems.Where(x => x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct());
-                        RecalculateSlotUses(db, updatedOrderItems.Where(x => x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct());
+                        List<OrderItemsTable> updatedOrderItems = (await db.SelectAsync<OrderItemsTable>(x => (clientId == null || x.ClientId == clientId) && x.OrderId == order.OrderId)).AsList();
+                        await RecalculateSpaces(db, updatedOrderItems.Where(x => x.OccurrenceId.HasValue).Select(x => x.OccurrenceId.Value).Distinct());
+                        await RecalculateSlotUses(db, updatedOrderItems.Where(x => x.SlotId.HasValue).Select(x => x.SlotId.Value).Distinct());
                     }
                     return true;
                 }
-                else
-                {
-                    return false;
-                }
+
+                return false;
             }
         }
 
-        public static void RecalculateSlotUses(IDbConnection db, SlotTable slot)
+        public static async Task RecalculateSlotUses(IDbConnection db, SlotTable slot)
         {
             if (slot == null)
                 return;
 
             // Update number of leased spaces remaining for the opportunity
-            var leasedUses = db.LoadSelect<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking && x.OrderTable.ProposalStatus != ProposalStatus.CustomerRejected && x.OrderTable.ProposalStatus != ProposalStatus.SellerRejected && x.SlotId == slot.Id).Count();
+            var leasedUses = (await db.LoadSelectAsync<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking && x.OrderTable.ProposalStatus != ProposalStatus.CustomerRejected && x.OrderTable.ProposalStatus != ProposalStatus.SellerRejected && x.SlotId == slot.Id)).Count;
             slot.LeasedUses = leasedUses;
 
             // Update number of actual spaces remaining for the opportunity
-            var totalUsesTaken = db.LoadSelect<OrderItemsTable>(x => x.OrderTable.OrderMode == OrderMode.Booking && x.OccurrenceId == slot.Id && (x.Status == BookingStatus.Confirmed || x.Status == BookingStatus.Attended || x.Status == BookingStatus.Absent)).Count();
+            var totalUsesTaken = (await db.LoadSelectAsync<OrderItemsTable>(x => x.OrderTable.OrderMode == OrderMode.Booking && x.OccurrenceId == slot.Id && (x.Status == BookingStatus.Confirmed || x.Status == BookingStatus.Attended || x.Status == BookingStatus.Absent))).Count;
             slot.RemainingUses = slot.MaximumUses - totalUsesTaken;
 
             // Push the change into the future to avoid it getting lost in the feed (see race condition transaction challenges https://developer.openactive.io/publishing-data/data-feeds/implementing-rpde-feeds#preventing-the-race-condition)
             // TODO: Document this!
             slot.Modified = DateTimeOffset.Now.UtcTicks;
-            db.Update(slot);
+            await db.UpdateAsync(slot);
         }
 
-        public static void RecalculateSlotUses(IDbConnection db, IEnumerable<long> slotIds)
+        public static async Task RecalculateSlotUses(IDbConnection db, IEnumerable<long> slotIds)
         {
             foreach (var slotId in slotIds)
             {
-                var thisSlot = db.Single<SlotTable>(x => x.Id == slotId && !x.Deleted);
-                RecalculateSlotUses(db, thisSlot);
+                var thisSlot = await db.SingleAsync<SlotTable>(x => x.Id == slotId && !x.Deleted);
+                await RecalculateSlotUses(db, thisSlot);
             }
         }
 
-        public static void RecalculateSpaces(IDbConnection db, OccurrenceTable occurrence)
+        public static async Task RecalculateSpaces(IDbConnection db, OccurrenceTable occurrence)
         {
             if (occurrence == null)
                 return;
 
             // Update number of leased spaces remaining for the opportunity
-            var leasedSpaces = db.LoadSelect<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking && x.OrderTable.ProposalStatus != ProposalStatus.CustomerRejected && x.OrderTable.ProposalStatus != ProposalStatus.SellerRejected && x.OccurrenceId == occurrence.Id).Count();
+            var leasedSpaces = (await db.LoadSelectAsync<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking && x.OrderTable.ProposalStatus != ProposalStatus.CustomerRejected && x.OrderTable.ProposalStatus != ProposalStatus.SellerRejected && x.OccurrenceId == occurrence.Id)).Count;
             occurrence.LeasedSpaces = leasedSpaces;
 
             // Update number of actual spaces remaining for the opportunity
-            var totalSpacesTaken = db.LoadSelect<OrderItemsTable>(x => x.OrderTable.OrderMode == OrderMode.Booking && x.OccurrenceId == occurrence.Id && (x.Status == BookingStatus.Confirmed || x.Status == BookingStatus.Attended || x.Status == BookingStatus.Absent)).Count();
+            var totalSpacesTaken = (await db.LoadSelectAsync<OrderItemsTable>(x => x.OrderTable.OrderMode == OrderMode.Booking && x.OccurrenceId == occurrence.Id && (x.Status == BookingStatus.Confirmed || x.Status == BookingStatus.Attended || x.Status == BookingStatus.Absent))).Count();
             occurrence.RemainingSpaces = occurrence.TotalSpaces - totalSpacesTaken;
 
             // Push the change into the future to avoid it getting lost in the feed (see race condition transaction challenges https://developer.openactive.io/publishing-data/data-feeds/implementing-rpde-feeds#preventing-the-race-condition) // TODO: Document this!
             occurrence.Modified = DateTimeOffset.Now.UtcTicks;
-            db.Update(occurrence);
+            await db.UpdateAsync(occurrence);
         }
 
-        public static void RecalculateSpaces(IDbConnection db, IEnumerable<long> occurrenceIds)
+        public static async Task RecalculateSpaces(IDbConnection db, IEnumerable<long> occurrenceIds)
         {
             foreach (var occurrenceId in occurrenceIds)
             {
-                var thisOccurrence = db.Single<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
-                RecalculateSpaces(db, thisOccurrence);
+                var thisOccurrence = await db.SingleAsync<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
+                await RecalculateSpaces(db, thisOccurrence);
             }
         }
 
-        public static FakeDatabase GetPrepopulatedFakeDatabase()
+        public static async Task<FakeDatabase> GetPrepopulatedFakeDatabase()
         {
             var database = new FakeDatabase();
-            using (var db = database.Mem.Database.Open())
+            using (var db = await database.Mem.Database.OpenAsync())
             using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
             {
 
-                CreateSellers(db);
-                CreateSellerUsers(db);
-                CreateFakeClasses(db);
-                CreateFakeFacilitiesAndSlots(db);
-                CreateBookingPartners(db);
+                await CreateSellers(db);
+                await CreateSellerUsers(db);
+                await CreateFakeClasses(db);
+                await CreateFakeFacilitiesAndSlots(db);
+                await CreateBookingPartners(db);
                 transaction.Commit();
             }
+
             return database;
         }
 
-        private static void CreateFakeFacilitiesAndSlots(IDbConnection db)
+        private static async Task CreateFakeFacilitiesAndSlots(IDbConnection db)
         {
             var opportunitySeeds = GenerateOpportunitySeedDistribution(OpportunityCount);
 
@@ -1415,9 +1383,9 @@ private static void CreateFakeFacilitiesAndSlots(IDbConnection db)
                     Name = $"{Faker.Commerce.ProductMaterial()} {Faker.PickRandomParam("Sports Hall", "Swimming Pool Hall", "Running Hall", "Jumping Hall")}",
                     SellerId = Faker.Random.Bool(0.8f) ? Faker.Random.Long(1, 2) : Faker.Random.Long(3, 5), // distribution: 80% 1-2, 20% 3-5  
                 })
-                .ToList();
+                .AsList();
 
-            int slotId = 0;
+            var slotId = 0;
             var slots = opportunitySeeds.Select(seed =>
                 Enumerable.Range(0, 10)
                     .Select(_ => new
@@ -1426,7 +1394,7 @@ private static void CreateFakeFacilitiesAndSlots(IDbConnection db)
                         TotalUses = Faker.Random.Int(0, 8),
                         Price = decimal.Parse(Faker.Random.Bool() ? "0.00" : Faker.Commerce.Price(0, 20)),
                     })
-                    .Select((slot) =>
+                    .Select(slot =>
                     {
                         var requiresAdditionalDetails = Faker.Random.Bool(ProportionWithRequiresAdditionalDetails);
                         return new SlotTable
@@ -1446,7 +1414,7 @@ private static void CreateFakeFacilitiesAndSlots(IDbConnection db)
                             RequiresAdditionalDetails = requiresAdditionalDetails,
                             RequiredAdditionalDetails = requiresAdditionalDetails ? PickRandomAdditionalDetails() : null,
                             RequiresApproval = seed.RequiresApproval,
-                            AllowsProposalAmendment = seed.RequiresApproval ? Faker.Random.Bool() : false,
+                            AllowsProposalAmendment = seed.RequiresApproval && Faker.Random.Bool(),
                             ValidFromBeforeStartDate = seed.RandomValidFromBeforeStartDate(),
                             LatestCancellationBeforeStartDate = RandomLatestCancellationBeforeStartDate(),
                             AllowCustomerCancellationFullRefund = Faker.Random.Bool()
@@ -1454,11 +1422,11 @@ private static void CreateFakeFacilitiesAndSlots(IDbConnection db)
                     }
                     )).SelectMany(os => os);
 
-            db.InsertAll(facilities);
-            db.InsertAll(slots);
+            await db.InsertAllAsync(facilities);
+            await db.InsertAllAsync(slots);
         }
 
-        public static void CreateFakeClasses(IDbConnection db)
+        public static async Task CreateFakeClasses(IDbConnection db)
         {
             var opportunitySeeds = GenerateOpportunitySeedDistribution(OpportunityCount);
 
@@ -1470,7 +1438,7 @@ public static void CreateFakeClasses(IDbConnection db)
                     ValidFromBeforeStartDate = seed.RandomValidFromBeforeStartDate(),
                     seed.RequiresApproval
                 })
-                .Select((@class) =>
+                .Select(@class =>
                 {
                     var requiresAdditionalDetails = Faker.Random.Bool(ProportionWithRequiresAdditionalDetails);
                     return new ClassTable
@@ -1486,7 +1454,7 @@ public static void CreateFakeClasses(IDbConnection db)
                         RequiresAdditionalDetails = requiresAdditionalDetails,
                         RequiredAdditionalDetails = requiresAdditionalDetails ? PickRandomAdditionalDetails() : null,
                         RequiresApproval = @class.RequiresApproval,
-                        AllowsProposalAmendment = @class.RequiresApproval ? Faker.Random.Bool() : false,
+                        AllowsProposalAmendment = @class.RequiresApproval && Faker.Random.Bool(),
                         LatestCancellationBeforeStartDate = RandomLatestCancellationBeforeStartDate(),
                         SellerId = Faker.Random.Bool(0.8f) ? Faker.Random.Long(1, 2) : Faker.Random.Long(3, 5), // distribution: 80% 1-2, 20% 3-5
                         ValidFromBeforeStartDate = @class.ValidFromBeforeStartDate,
@@ -1494,9 +1462,9 @@ public static void CreateFakeClasses(IDbConnection db)
                         AllowCustomerCancellationFullRefund = Faker.Random.Bool()
                     };
                 })
-                .ToList();
+                .AsList();
 
-            int occurrenceId = 0;
+            var occurrenceId = 0;
             var occurrences = opportunitySeeds.Select(seed =>
                 Enumerable.Range(0, 10)
                     .Select(_ => new
@@ -1515,11 +1483,11 @@ public static void CreateFakeClasses(IDbConnection db)
                         RemainingSpaces = occurrence.TotalSpaces
                     })).SelectMany(os => os);
 
-            db.InsertAll(classes);
-            db.InsertAll(occurrences);
+            await db.InsertAllAsync(classes);
+            await db.InsertAllAsync(occurrences);
         }
 
-        public static void CreateSellers(IDbConnection db)
+        public static async Task CreateSellers(IDbConnection db)
         {
             var sellers = new List<SellerTable>
             {
@@ -1530,10 +1498,10 @@ public static void CreateSellers(IDbConnection db)
                 new SellerTable { Id = 5, Name = "Jane Smith", IsIndividual = true, LogoUrl = "https://placekitten.com/640/360", Url = "https://www.example.com", IsTaxGross = true }
             };
 
-            db.InsertAll(sellers);
+            await db.InsertAllAsync(sellers);
         }
 
-        public static void CreateSellerUsers(IDbConnection db)
+        public static async Task CreateSellerUsers(IDbConnection db)
         {
             var sellerUsers = new List<SellerUserTable>
             {
@@ -1545,31 +1513,31 @@ public static void CreateSellerUsers(IDbConnection db)
                 new SellerUserTable { Id = 105, Username = "test5", PasswordHash = "test5".Sha256(), SellerId = 5 },
             };
 
-            db.InsertAll(sellerUsers);
+            await db.InsertAllAsync(sellerUsers);
         }
 
-        public bool ValidateSellerUserCredentials(string Username, string Password)
+        public async Task<bool> ValidateSellerUserCredentials(string username, string password)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var matchingUser = db.Single<SellerUserTable>(x => x.Username == Username && x.PasswordHash == Password.Sha256());
-                return (matchingUser != null);
+                var matchingUser = await db.SingleAsync<SellerUserTable>(x => x.Username == username && x.PasswordHash == password.Sha256());
+                return matchingUser != null;
             }
         }
 
-        public SellerUserTable GetSellerUser(string Username)
+        public async Task<SellerUserTable> GetSellerUser(string username)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                return db.Single<SellerUserTable>(x => x.Username == Username);
+                return await db.SingleAsync<SellerUserTable>(x => x.Username == username);
             }
         }
 
-        public SellerUserTable GetSellerUserById(long sellerUserId)
+        public async Task<SellerUserTable> GetSellerUserById(long sellerUserId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                return db.LoadSingleById<SellerUserTable>(sellerUserId);
+                return await db.LoadSingleByIdAsync<SellerUserTable>(sellerUserId);
             }
         }
 
@@ -1596,8 +1564,7 @@ public List<BookingPartnerAdministratorTable> GetBookingPartnerAdministrators()
         }
         */
 
-
-        public static void CreateBookingPartners(IDbConnection db)
+        public static async Task CreateBookingPartners(IDbConnection db)
         {
             var bookingPartners = new List<BookingPartnerTable>
             {
@@ -1608,7 +1575,7 @@ public static void CreateBookingPartners(IDbConnection db)
                         GrantTypes = new[] { "client_credentials", "refresh_token", "authorization_code" },
                         ClientUri = "http://example.com",
                         LogoUri = "https://via.placeholder.com/512x256.png?text=Logo",
-                        RedirectUris = new string[] { "http://localhost:3000/cb" }
+                        RedirectUris = new[] { "http://localhost:3000/cb" }
                     }
                 },
                 new BookingPartnerTable { Name = "Example app", ClientId = "clientid_801", ClientSecret = "secret".Sha256(), Email="garden@health.com", Registered = true, InitialAccessToken = "98768", InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now, BookingsSuspended = false,
@@ -1617,183 +1584,182 @@ public static void CreateBookingPartners(IDbConnection db)
                         GrantTypes = new[] { "client_credentials", "refresh_token", "authorization_code" },
                         ClientUri = "http://example.com",
                         LogoUri = "https://via.placeholder.com/512x256.png?text=Logo",
-                        RedirectUris = new string[] { "http://localhost:3000/cb" }
+                        RedirectUris = new[] { "http://localhost:3000/cb" }
                     }
                 },
                 new BookingPartnerTable { Name = "Test Suite 2", ClientId = Guid.NewGuid().ToString(), InitialAccessToken = "dynamic-primary-745ddf2d13019ce8b69c", Registered = false, InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now },
                 new BookingPartnerTable { Name = "Test Suite 3", ClientId = Guid.NewGuid().ToString(), InitialAccessToken = "dynamic-secondary-a21518cb57af7b6052df", Registered = false, InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now }
             };
 
-            var grants = new List<GrantTable>()
-            {
-                new GrantTable()
-                {
-                    Key = "8vJ5rH7eSj7HL4TD5Tlaeyfa+U6WkFc/ofBdkVuM/RY=",
-                    Type = "user_consent",
-                    SubjectId = "TestSubjectId",
-                    ClientId = "clientid_123",
-                    CreationTime = DateTime.Now,
-                    Data = "{\"SubjectId\":\"818727\",\"ClientId\":\"clientid_123\",\"Scopes\":[\"openid\",\"profile\",\"openactive-identity\",\"openactive-openbooking\",\"oauth-dymamic-client-update\",\"offline_access\"],\"CreationTime\":\"2020-03-01T13:17:57Z\",\"Expiration\":null}"
-                },
-                new GrantTable()
-                {
-                    Key = "7vJ5rH7eSj7HL4TD5Tlaeyfa+U6WkFc/ofBdkVuM/RY=",
-                    Type = "user_consent",
-                    SubjectId = "TestSubjectId",
-                    ClientId = "clientid_456",
-                    CreationTime = DateTime.Now,
-                    Data = "{\"SubjectId\":\"818727\",\"ClientId\":\"clientid_456\",\"Scopes\":[\"openid\",\"profile\",\"openactive-identity\",\"openactive-openbooking\",\"oauth-dymamic-client-update\",\"offline_access\"],\"CreationTime\":\"2020-03-01T13:17:57Z\",\"Expiration\":null}"
-                },
-                new GrantTable()
-                {
-                    Key = "9vJ5rH7eSj7HL4TD5Tlaeyfa+U6WkFc/ofBdkVuM/RY=",
-                    Type = "user_consent",
-                    SubjectId = "TestSubjectId",
-                    ClientId = "clientid_789",
-                    CreationTime = DateTime.Now,
-                    Data = "{\"SubjectId\":\"818727\",\"ClientId\":\"clientid_789\",\"Scopes\":[\"openid\",\"profile\",\"openactive-identity\",\"openactive-openbooking\",\"oauth-dymamic-client-update\",\"offline_access\"],\"CreationTime\":\"2020-03-01T13:17:57Z\",\"Expiration\":null}"
-                },
-            };
-
-            db.InsertAll(bookingPartners);
-            //db.InsertAll(grants);
-        }
-
-        public List<BookingPartnerTable> GetBookingPartners()
-        {
-            using (var db = Mem.Database.Open())
-            {
-                return db.Select<BookingPartnerTable>().ToList();
+            // var grants = new List<GrantTable>()
+            // {
+            //     new GrantTable
+            //     {
+            //         Key = "8vJ5rH7eSj7HL4TD5Tlaeyfa+U6WkFc/ofBdkVuM/RY=",
+            //         Type = "user_consent",
+            //         SubjectId = "TestSubjectId",
+            //         ClientId = "clientid_123",
+            //         CreationTime = DateTime.Now,
+            //         Data = "{\"SubjectId\":\"818727\",\"ClientId\":\"clientid_123\",\"Scopes\":[\"openid\",\"profile\",\"openactive-identity\",\"openactive-openbooking\",\"oauth-dymamic-client-update\",\"offline_access\"],\"CreationTime\":\"2020-03-01T13:17:57Z\",\"Expiration\":null}"
+            //     },
+            //     new GrantTable
+            //     {
+            //         Key = "7vJ5rH7eSj7HL4TD5Tlaeyfa+U6WkFc/ofBdkVuM/RY=",
+            //         Type = "user_consent",
+            //         SubjectId = "TestSubjectId",
+            //         ClientId = "clientid_456",
+            //         CreationTime = DateTime.Now,
+            //         Data = "{\"SubjectId\":\"818727\",\"ClientId\":\"clientid_456\",\"Scopes\":[\"openid\",\"profile\",\"openactive-identity\",\"openactive-openbooking\",\"oauth-dymamic-client-update\",\"offline_access\"],\"CreationTime\":\"2020-03-01T13:17:57Z\",\"Expiration\":null}"
+            //     },
+            //     new GrantTable
+            //     {
+            //         Key = "9vJ5rH7eSj7HL4TD5Tlaeyfa+U6WkFc/ofBdkVuM/RY=",
+            //         Type = "user_consent",
+            //         SubjectId = "TestSubjectId",
+            //         ClientId = "clientid_789",
+            //         CreationTime = DateTime.Now,
+            //         Data = "{\"SubjectId\":\"818727\",\"ClientId\":\"clientid_789\",\"Scopes\":[\"openid\",\"profile\",\"openactive-identity\",\"openactive-openbooking\",\"oauth-dymamic-client-update\",\"offline_access\"],\"CreationTime\":\"2020-03-01T13:17:57Z\",\"Expiration\":null}"
+            //     },
+            // };
+
+            await db.InsertAllAsync(bookingPartners);
+            //await db.InsertAllAsync(grants);
+        }
+
+        public async Task<List<BookingPartnerTable>> GetBookingPartners()
+        {
+            using (var db = await Mem.Database.OpenAsync())
+            {
+                return (await db.SelectAsync<BookingPartnerTable>()).AsList();
             }
         }
 
-        public BookingPartnerTable GetBookingPartnerByInitialAccessToken(string registrationKey)
+        public async Task<BookingPartnerTable> GetBookingPartnerByInitialAccessToken(string registrationKey)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var bookingPartner = db.Single<BookingPartnerTable>(x => x.InitialAccessToken == registrationKey);
+                var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.InitialAccessToken == registrationKey);
                 return bookingPartner?.InitialAccessTokenKeyValidUntil > DateTime.Now ? bookingPartner : null;
             }
         }
 
-        public BookingPartnerTable GetBookingPartner(string clientId)
+        public async Task<BookingPartnerTable> GetBookingPartner(string clientId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                return db.Single<BookingPartnerTable>(x => x.ClientId == clientId);
+                return await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
             }
         }
 
-        public void SaveBookingPartner(BookingPartnerTable bookingPartnerTable)
+        public async Task SaveBookingPartner(BookingPartnerTable bookingPartnerTable)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                db.Save(bookingPartnerTable);
+                await db.SaveAsync(bookingPartnerTable);
             }
         }
 
-        public void ResetBookingPartnerKey(string clientId, string key)
+        public async Task ResetBookingPartnerKey(string clientId, string key)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var bookingPartner = db.Single<BookingPartnerTable>(x => x.ClientId == clientId);
+                var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
                 bookingPartner.Registered = false;
                 bookingPartner.InitialAccessToken = key;
                 bookingPartner.InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(2);
                 bookingPartner.ClientSecret = null;
-                db.Save(bookingPartner);
+                await db.SaveAsync(bookingPartner);
             }
         }
 
-        public void SetBookingPartnerKey(string clientId, string key)
+        public async Task SetBookingPartnerKey(string clientId, string key)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var bookingPartner = db.Single<BookingPartnerTable>(x => x.ClientId == clientId);
+                var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
                 bookingPartner.InitialAccessToken = key;
                 bookingPartner.InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(2);
-                db.Save(bookingPartner);
+                await db.SaveAsync(bookingPartner);
             }
         }
 
-        public void UpdateBookingPartnerScope(string clientId, string scope, bool bookingsSuspended)
+        public async Task UpdateBookingPartnerScope(string clientId, string scope, bool bookingsSuspended)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var bookingPartner = db.Single<BookingPartnerTable>(x => x.ClientId == clientId);
+                var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
                 bookingPartner.ClientProperties.Scope = scope;
                 bookingPartner.BookingsSuspended = true;
-                db.Save(bookingPartner);
+                await db.SaveAsync(bookingPartner);
             }
         }
 
-
-        public void AddBookingPartner(BookingPartnerTable newBookingPartner)
+        public async Task AddBookingPartner(BookingPartnerTable newBookingPartner)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                db.Save(newBookingPartner);
+                await db.SaveAsync(newBookingPartner);
             }
         }
 
-        public GrantTable GetGrant(string key)
+        public async Task<GrantTable> GetGrant(string key)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                return db.Single<GrantTable>(x => x.Key == key);
+                return await db.SingleAsync<GrantTable>(x => x.Key == key);
             }
         }
-        public IEnumerable<GrantTable> GetAllGrants(string subjectId)
+        public async Task<IEnumerable<GrantTable>> GetAllGrants(string subjectId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                return db.Select<GrantTable>(x => x.SubjectId == subjectId).ToList();
+                return (await db.SelectAsync<GrantTable>(x => x.SubjectId == subjectId)).AsList();
             }
         }
 
-        public void AddGrant(string key, string type, string subjectId, string clientId, DateTime CreationTime, DateTime? Expiration, string data)
+        public async Task AddGrant(string key, string type, string subjectId, string clientId, DateTime creationTime, DateTime? expiration, string data)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var grant = new GrantTable()
+                var grant = new GrantTable
                 {
                     Key = key,
                     Type = type,
                     SubjectId = subjectId,
                     ClientId = clientId,
-                    CreationTime = CreationTime,
-                    Expiration = Expiration,
+                    CreationTime = creationTime,
+                    Expiration = expiration,
                     Data = data
                 };
-                db.Save(grant);
+                await db.SaveAsync(grant);
             }
         }
 
-        public void RemoveGrant(string key)
+        public async Task RemoveGrant(string key)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                db.Delete<GrantTable>(x => x.Key == key);
+                await db.DeleteAsync<GrantTable>(x => x.Key == key);
             }
         }
 
-        public void RemoveGrant(string subjectId, string clientId)
+        public async Task RemoveGrant(string subjectId, string clientId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                db.Delete<GrantTable>(x => x.SubjectId == subjectId && x.ClientId == clientId);
+                await db.DeleteAsync<GrantTable>(x => x.SubjectId == subjectId && x.ClientId == clientId);
             }
         }
 
-        public void RemoveGrant(string subjectId, string clientId, string type)
+        public async Task RemoveGrant(string subjectId, string clientId, string type)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                db.Delete<GrantTable>(x => x.SubjectId == subjectId && x.ClientId == clientId && x.Type == type);
+                await db.DeleteAsync<GrantTable>(x => x.SubjectId == subjectId && x.ClientId == clientId && x.Type == type);
             }
         }
 
-        public (int, int) AddClass(
+        public async Task<(int, int)> AddClass(
             string testDatasetIdentifier,
             long? sellerId,
             string title,
@@ -1816,7 +1782,7 @@ public void RemoveGrant(string subjectId, string clientId, string type)
             var startTime = DateTime.Now.AddDays(inPast ? -1 : 1);
             var endTime = DateTime.Now.AddDays(inPast ? -1 : 1).AddHours(1);
 
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
             {
                 var @class = new ClassTable
@@ -1844,7 +1810,7 @@ public void RemoveGrant(string subjectId, string clientId, string type)
                     AllowCustomerCancellationFullRefund = allowCustomerCancellationFullRefund,
                     Modified = DateTimeOffset.Now.UtcTicks
                 };
-                db.Save(@class);
+                await db.SaveAsync(@class);
 
                 var occurrence = new OccurrenceTable
                 {
@@ -1857,7 +1823,7 @@ public void RemoveGrant(string subjectId, string clientId, string type)
                     RemainingSpaces = totalSpaces,
                     Modified = DateTimeOffset.Now.UtcTicks
                 };
-                db.Save(occurrence);
+                await db.SaveAsync(occurrence);
 
                 transaction.Commit();
 
@@ -1865,7 +1831,7 @@ public void RemoveGrant(string subjectId, string clientId, string type)
             }
         }
 
-        public (int, int) AddFacility(
+        public async Task<(int, int)> AddFacility(
             string testDatasetIdentifier,
             long? sellerId,
             string title,
@@ -1886,7 +1852,7 @@ public void RemoveGrant(string subjectId, string clientId, string type)
             var startTime = DateTime.Now.AddDays(inPast ? -1 : 1);
             var endTime = DateTime.Now.AddDays(inPast ? -1 : 1).AddHours(1);
 
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
             {
                 var facility = new FacilityUseTable
@@ -1899,7 +1865,7 @@ public void RemoveGrant(string subjectId, string clientId, string type)
                     LocationLng = locationLng,
                     Modified = DateTimeOffset.Now.UtcTicks
                 };
-                db.Save(facility);
+                await db.SaveAsync(facility);
 
                 var slot = new SlotTable
                 {
@@ -1926,7 +1892,7 @@ public void RemoveGrant(string subjectId, string clientId, string type)
                     AllowCustomerCancellationFullRefund = allowCustomerCancellationFullRefund,
                     Modified = DateTimeOffset.Now.UtcTicks
                 };
-                db.Save(slot);
+                await db.SaveAsync(slot);
 
                 transaction.Commit();
 
@@ -1934,26 +1900,26 @@ public void RemoveGrant(string subjectId, string clientId, string type)
             }
         }
 
-        public void DeleteTestClassesFromDataset(string testDatasetIdentifier)
+        public async Task DeleteTestClassesFromDataset(string testDatasetIdentifier)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                db.UpdateOnly(() => new ClassTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
+                await db.UpdateOnlyAsync(() => new ClassTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
                     where: x => x.TestDatasetIdentifier == testDatasetIdentifier && !x.Deleted);
 
-                db.UpdateOnly(() => new OccurrenceTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
+                await db.UpdateOnlyAsync(() => new OccurrenceTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
                     where: x => x.TestDatasetIdentifier == testDatasetIdentifier && !x.Deleted);
             }
         }
 
-        public void DeleteTestFacilitiesFromDataset(string testDatasetIdentifier)
+        public async Task DeleteTestFacilitiesFromDataset(string testDatasetIdentifier)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                db.UpdateOnly(() => new FacilityUseTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
+                await db.UpdateOnlyAsync(() => new FacilityUseTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
                     where: x => x.TestDatasetIdentifier == testDatasetIdentifier && !x.Deleted);
 
-                db.UpdateOnly(() => new SlotTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
+                await db.UpdateOnlyAsync(() => new SlotTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
                     where: x => x.TestDatasetIdentifier == testDatasetIdentifier && !x.Deleted);
             }
         }
@@ -1988,7 +1954,7 @@ private static OpportunitySeed GenerateRandomOpportunityData(Faker faker, int in
         {
             return new OpportunitySeed
             {
-                Faker = faker,
+                SeedFaker = faker,
                 Id = index + 1,
                 StartDateBounds = BoundsDaysToMinutes(input.startDateRange).Value,
                 ValidFromBeforeStartDateBounds = !input.validFromBeforeStartDateRange.HasValue ? (Bounds?)null : BoundsDaysToMinutes(input.validFromBeforeStartDateRange).Value,
@@ -1998,8 +1964,8 @@ private static OpportunitySeed GenerateRandomOpportunityData(Faker faker, int in
 
         private static Bounds? BoundsDaysToMinutes(Bounds? bounds)
         {
-            const int MINUTES_IN_DAY = 60 * 24;
-            return !bounds.HasValue ? (Bounds?)null : new Bounds(bounds.Value.Lower * MINUTES_IN_DAY, bounds.Value.Upper * MINUTES_IN_DAY);
+            const int minutesInDay = 60 * 24;
+            return !bounds.HasValue ? (Bounds?)null : new Bounds(bounds.Value.Lower * minutesInDay, bounds.Value.Upper * minutesInDay);
         }
 
         /// <summary>
@@ -2007,20 +1973,20 @@ private static OpportunitySeed GenerateRandomOpportunityData(Faker faker, int in
         /// </summary>
         private static List<OpportunitySeed> GenerateOpportunitySeedDistribution(int count)
         {
-            return Faker.GenerateIntegerDistribution(count, BucketDefinitions, GenerateRandomOpportunityData).ToList();
+            return Faker.GenerateIntegerDistribution(count, BucketDefinitions, GenerateRandomOpportunityData).AsList();
         }
 
         private struct OpportunitySeed
         {
-            public Faker Faker { get; set; }
+            public Faker SeedFaker { get; set; }
             public int Id { get; set; }
             public Bounds StartDateBounds { get; set; }
             public Bounds? ValidFromBeforeStartDateBounds { get; set; }
 
-            public DateTime RandomStartDate() => DateTime.Now.AddMinutes(this.Faker.Random.Int(StartDateBounds));
+            public DateTime RandomStartDate() => DateTime.Now.AddMinutes(SeedFaker.Random.Int(StartDateBounds));
 
             public TimeSpan? RandomValidFromBeforeStartDate() => ValidFromBeforeStartDateBounds.HasValue
-                ? TimeSpan.FromMinutes(this.Faker.Random.Int(ValidFromBeforeStartDateBounds.Value))
+                ? TimeSpan.FromMinutes(SeedFaker.Random.Int(ValidFromBeforeStartDateBounds.Value))
                 : (TimeSpan?)null;
             public bool RequiresApproval { get; set; }
         }
@@ -2035,7 +2001,7 @@ private struct OpportunitySeed
 
         private static List<AdditionalDetailTypes> PickRandomAdditionalDetails()
         {
-            return new HashSet<AdditionalDetailTypes> { Faker.PickRandom<AdditionalDetailTypes>(), Faker.PickRandom<AdditionalDetailTypes>() }.ToList();
+            return new HashSet<AdditionalDetailTypes> { Faker.PickRandom<AdditionalDetailTypes>(), Faker.PickRandom<AdditionalDetailTypes>() }.AsList();
         }
     }
 }
diff --git a/Fakes/OpenActive.FakeDatabase.NET/FakeDatabaseTransaction.cs b/Fakes/OpenActive.FakeDatabase.NET/FakeDatabaseTransaction.cs
index fa4b6c02..fff6c808 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/FakeDatabaseTransaction.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/FakeDatabaseTransaction.cs
@@ -1,10 +1,6 @@
 using ServiceStack.OrmLite;
 using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OpenActive.FakeDatabase.NET
 {
diff --git a/OpenActive.Server.NET.Tests/IdTemplate.cs b/OpenActive.Server.NET.Tests/IdTemplate.cs
index 3f40bd39..26f615c8 100644
--- a/OpenActive.Server.NET.Tests/IdTemplate.cs
+++ b/OpenActive.Server.NET.Tests/IdTemplate.cs
@@ -1,6 +1,5 @@
 using System;
 using Xunit;
-using OpenActive.Server.NET;
 using OpenActive.DatasetSite.NET;
 using OpenActive.Server.NET.OpenBookingHelper;
 
diff --git a/OpenActive.Server.NET.Tests/SellerIdComponentsTest.cs b/OpenActive.Server.NET.Tests/SellerIdComponentsTest.cs
index 2fa4c7e1..717d4b04 100644
--- a/OpenActive.Server.NET.Tests/SellerIdComponentsTest.cs
+++ b/OpenActive.Server.NET.Tests/SellerIdComponentsTest.cs
@@ -1,7 +1,4 @@
-using System;
-using Xunit;
-using OpenActive.Server.NET;
-using OpenActive.DatasetSite.NET;
+using Xunit;
 using OpenActive.Server.NET.OpenBookingHelper;
 
 namespace OpenActive.Server.NET.Tests
diff --git a/OpenActive.Server.NET.Tests/StoreBookingEngineTest.cs b/OpenActive.Server.NET.Tests/StoreBookingEngineTest.cs
index f7d6edbf..d105fcad 100644
--- a/OpenActive.Server.NET.Tests/StoreBookingEngineTest.cs
+++ b/OpenActive.Server.NET.Tests/StoreBookingEngineTest.cs
@@ -1,7 +1,4 @@
-using System;
-using Xunit;
-using OpenActive.Server.NET;
-using OpenActive.NET;
+using Xunit;
 
 namespace OpenActive.Server.NET.Tests
 {
diff --git a/OpenActive.Server.NET/Entrypoint/IBookingEngine.cs b/OpenActive.Server.NET/Entrypoint/IBookingEngine.cs
index 1f8a0eb0..a48efdb3 100644
--- a/OpenActive.Server.NET/Entrypoint/IBookingEngine.cs
+++ b/OpenActive.Server.NET/Entrypoint/IBookingEngine.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-using OpenActive.NET;
-using OpenActive.NET.Rpde.Version1;
 using OpenActive.Server.NET.OpenBookingHelper;
 
 namespace OpenActive.Server.NET
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Authentication/AuthenticationExtensions.cs b/OpenActive.Server.NET/OpenBookingHelper/Authentication/AuthenticationExtensions.cs
index 1b06cfb1..3a523dd8 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Authentication/AuthenticationExtensions.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Authentication/AuthenticationExtensions.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Security.Claims;
-using System.Text;
 using OpenActive.NET;
 
 namespace OpenActive.Server.NET.OpenBookingHelper
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Authentication/AuthenticationTestHeaders.cs b/OpenActive.Server.NET/OpenBookingHelper/Authentication/AuthenticationTestHeaders.cs
index d0526321..dc672927 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Authentication/AuthenticationTestHeaders.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Authentication/AuthenticationTestHeaders.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenActive.Server.NET.OpenBookingHelper
+namespace OpenActive.Server.NET.OpenBookingHelper
 {
     public static class AuthenticationTestHeaders
     {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Authentication/OpenActiveCustomClaimNames.cs b/OpenActive.Server.NET/OpenBookingHelper/Authentication/OpenActiveCustomClaimNames.cs
index d4985cfd..f148a8c0 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Authentication/OpenActiveCustomClaimNames.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Authentication/OpenActiveCustomClaimNames.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenActive.Server.NET.OpenBookingHelper
+namespace OpenActive.Server.NET.OpenBookingHelper
 {
     public static class OpenActiveCustomClaimNames
     {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Authentication/OpenActiveScopes.cs b/OpenActive.Server.NET/OpenBookingHelper/Authentication/OpenActiveScopes.cs
index e839f7e7..eff392cb 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Authentication/OpenActiveScopes.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Authentication/OpenActiveScopes.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenActive.Server.NET.OpenBookingHelper
+namespace OpenActive.Server.NET.OpenBookingHelper
 {
     public static class OpenActiveScopes
     {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Beta/AuthenticatedPerson.cs b/OpenActive.Server.NET/OpenBookingHelper/Beta/AuthenticatedPerson.cs
index 59cd1de3..a2e6e66a 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Beta/AuthenticatedPerson.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Beta/AuthenticatedPerson.cs
@@ -1,7 +1,4 @@
 using OpenActive.NET;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenActive.Server.NET.OpenBookingHelper.Beta
 {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Content/ResponseContent.cs b/OpenActive.Server.NET/OpenBookingHelper/Content/ResponseContent.cs
index f132d3ba..7a372724 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Content/ResponseContent.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Content/ResponseContent.cs
@@ -1,9 +1,5 @@
 using OpenActive.NET;
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Text;
 
 namespace OpenActive.Server.NET.OpenBookingHelper
 {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Context/BookingFlowContext.cs b/OpenActive.Server.NET/OpenBookingHelper/Context/BookingFlowContext.cs
index 919c810d..b9ebdbe7 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Context/BookingFlowContext.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Context/BookingFlowContext.cs
@@ -1,8 +1,4 @@
 using OpenActive.NET;
-using OpenActive.Server.NET.OpenBookingHelper;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenActive.Server.NET.OpenBookingHelper
 {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/DynamicClientRegistration/ClientRegistrationModel.cs b/OpenActive.Server.NET/OpenBookingHelper/DynamicClientRegistration/ClientRegistrationModel.cs
index 46e8472c..6ee41b6f 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/DynamicClientRegistration/ClientRegistrationModel.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/DynamicClientRegistration/ClientRegistrationModel.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenActive.Server.NET.OpenBookingHelper
 {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/DynamicClientRegistration/OidcConstants.cs b/OpenActive.Server.NET/OpenBookingHelper/DynamicClientRegistration/OidcConstants.cs
index 571ca8ae..34223d1d 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/DynamicClientRegistration/OidcConstants.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/DynamicClientRegistration/OidcConstants.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenActive.Server.NET.OpenBookingHelper
+namespace OpenActive.Server.NET.OpenBookingHelper
 {
     public static class OidcConstants
     {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Enums/FlowStage.cs b/OpenActive.Server.NET/OpenBookingHelper/Enums/FlowStage.cs
index 6ea4bced..f68232ff 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Enums/FlowStage.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Enums/FlowStage.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenActive.Server.NET.OpenBookingHelper
+namespace OpenActive.Server.NET.OpenBookingHelper
 {
     public enum FlowStage { C1, C2, P, B, OrderStatus }
 }
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Enums/TaxPayeeRelationship.cs b/OpenActive.Server.NET/OpenBookingHelper/Enums/TaxPayeeRelationship.cs
index 2a3639da..c70e43e2 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Enums/TaxPayeeRelationship.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Enums/TaxPayeeRelationship.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenActive.Server.NET.OpenBookingHelper
+namespace OpenActive.Server.NET.OpenBookingHelper
 {
     public enum TaxPayeeRelationship
     {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Exceptions/OpenBookingException.cs b/OpenActive.Server.NET/OpenBookingHelper/Exceptions/OpenBookingException.cs
index f66726d3..2aeb0d1a 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Exceptions/OpenBookingException.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Exceptions/OpenBookingException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.Serialization;
 using OpenActive.NET;
 using System.Net;
diff --git a/OpenActive.Server.NET/OpenBookingHelper/IdTransforms/DefaultComponents.cs b/OpenActive.Server.NET/OpenBookingHelper/IdTransforms/DefaultComponents.cs
index 28988776..a13a0f21 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/IdTransforms/DefaultComponents.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/IdTransforms/DefaultComponents.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
-using System.Text;
-using OpenActive.NET;
 
 namespace OpenActive.Server.NET.OpenBookingHelper
 {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Model/ModelSupport.cs b/OpenActive.Server.NET/OpenBookingHelper/Model/ModelSupport.cs
index 4a5ea4c1..149af1c2 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Model/ModelSupport.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Model/ModelSupport.cs
@@ -1,8 +1,5 @@
 using OpenActive.DatasetSite.NET;
-using OpenActive.NET;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenActive.Server.NET.OpenBookingHelper
 {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Model/OrderModelSupport.cs b/OpenActive.Server.NET/OpenBookingHelper/Model/OrderModelSupport.cs
index dd8208e3..cdf686d2 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Model/OrderModelSupport.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Model/OrderModelSupport.cs
@@ -1,8 +1,4 @@
-using OpenActive.DatasetSite.NET;
-using OpenActive.NET;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
 
 namespace OpenActive.Server.NET.OpenBookingHelper
 {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Rpde/OrdersRpdeBase.cs b/OpenActive.Server.NET/OpenBookingHelper/Rpde/OrdersRpdeBase.cs
index 8b3657a4..165f76bf 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Rpde/OrdersRpdeBase.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Rpde/OrdersRpdeBase.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using OpenActive.DatasetSite.NET;
-using OpenActive.NET;
 using OpenActive.NET.Rpde.Version1;
 
 // TODO: Consolidate this logic with RpdeBase.cs to remove duplication (using generics?)
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Rpde/RpdeOrderingStrategyRouter.cs b/OpenActive.Server.NET/OpenBookingHelper/Rpde/RpdeOrderingStrategyRouter.cs
index af3adc88..d1882e17 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Rpde/RpdeOrderingStrategyRouter.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Rpde/RpdeOrderingStrategyRouter.cs
@@ -45,7 +45,7 @@ public static class RpdeOrderingStrategyRouter
         /// <param name="afterId"></param>
         /// <param name="afterChangeNumber"></param>
         /// <returns></returns>
-        public async static Task<RpdePage> GetRpdePage(this IRpdeFeedGenerator generator, string feedidentifier, long? afterTimestamp, string afterId, long? afterChangeNumber)
+        public static async Task<RpdePage> GetRpdePage(this IRpdeFeedGenerator generator, string feedidentifier, long? afterTimestamp, string afterId, long? afterChangeNumber)
         {
             switch (generator)
             {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Settings/BookingEngineSettings.cs b/OpenActive.Server.NET/OpenBookingHelper/Settings/BookingEngineSettings.cs
index 1206fb1f..551b2c54 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Settings/BookingEngineSettings.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Settings/BookingEngineSettings.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using OpenActive.DatasetSite.NET;
-using OpenActive.NET;
-using OpenActive.NET.Rpde.Version1;
 
 namespace OpenActive.Server.NET.OpenBookingHelper
 {
diff --git a/OpenActive.Server.NET/OpenBookingHelper/Stores/SellerStore.cs b/OpenActive.Server.NET/OpenBookingHelper/Stores/SellerStore.cs
index 40e8f897..d0601b94 100644
--- a/OpenActive.Server.NET/OpenBookingHelper/Stores/SellerStore.cs
+++ b/OpenActive.Server.NET/OpenBookingHelper/Stores/SellerStore.cs
@@ -1,8 +1,5 @@
 using OpenActive.NET;
-using OpenActive.Server.NET.OpenBookingHelper;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 
 
diff --git a/OpenActive.Server.NET/StoreBookingEngine/Context/StoreBookingFlowContext.cs b/OpenActive.Server.NET/StoreBookingEngine/Context/StoreBookingFlowContext.cs
index a577a213..47c8f257 100644
--- a/OpenActive.Server.NET/StoreBookingEngine/Context/StoreBookingFlowContext.cs
+++ b/OpenActive.Server.NET/StoreBookingEngine/Context/StoreBookingFlowContext.cs
@@ -1,9 +1,7 @@
 using OpenActive.NET;
-using OpenActive.Server.NET.CustomBooking;
 using OpenActive.Server.NET.OpenBookingHelper;
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenActive.Server.NET.StoreBooking
 {
diff --git a/OpenActive.Server.NET/StoreBookingEngine/StoreBookingEngine.cs b/OpenActive.Server.NET/StoreBookingEngine/StoreBookingEngine.cs
index 1e35a801..7fca642c 100644
--- a/OpenActive.Server.NET/StoreBookingEngine/StoreBookingEngine.cs
+++ b/OpenActive.Server.NET/StoreBookingEngine/StoreBookingEngine.cs
@@ -296,7 +296,7 @@ public StoreBookingEngine(BookingEngineSettings settings, DatasetSiteGeneratorSe
         private readonly Dictionary<OpportunityType, IOpportunityStore> storeRouting;
         private readonly StoreBookingEngineSettings storeBookingEngineSettings;
 
-        protected async override Task<Event> InsertTestOpportunity(string testDatasetIdentifier, OpportunityType opportunityType, TestOpportunityCriteriaEnumeration criteria, TestOpenBookingFlowEnumeration openBookingFlow, SellerIdComponents seller)
+        protected override async Task<Event> InsertTestOpportunity(string testDatasetIdentifier, OpportunityType opportunityType, TestOpportunityCriteriaEnumeration criteria, TestOpenBookingFlowEnumeration openBookingFlow, SellerIdComponents seller)
         {
             if (!storeRouting.ContainsKey(opportunityType))
                 throw new InternalOpenBookingException(new InternalLibraryConfigurationError(), "Specified opportunity type is not configured as bookable in the StoreBookingEngine constructor.");
@@ -304,7 +304,7 @@ protected async override Task<Event> InsertTestOpportunity(string testDatasetIde
             return await storeRouting[opportunityType].CreateOpportunityWithinTestDataset(testDatasetIdentifier, opportunityType, criteria, openBookingFlow, seller);
         }
 
-        protected async override Task DeleteTestDataset(string testDatasetIdentifier)
+        protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
             foreach (var store in storeRouting.Values)
             {
@@ -312,7 +312,7 @@ protected async override Task DeleteTestDataset(string testDatasetIdentifier)
             }
         }
 
-        protected async override Task TriggerTestAction(OpenBookingSimulateAction simulateAction, OrderIdTemplate orderIdTemplate)
+        protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, OrderIdTemplate orderIdTemplate)
         {
             switch (simulateAction.Object.Value)
             {
@@ -355,7 +355,7 @@ protected async override Task TriggerTestAction(OpenBookingSimulateAction simula
         }
 
 
-        public async override Task ProcessCustomerCancellation(OrderIdComponents orderId, SellerIdComponents sellerId, OrderIdTemplate orderIdTemplate, List<OrderIdComponents> orderItemIds)
+        public override async Task ProcessCustomerCancellation(OrderIdComponents orderId, SellerIdComponents sellerId, OrderIdTemplate orderIdTemplate, List<OrderIdComponents> orderItemIds)
         {
             if (!await storeBookingEngineSettings.OrderStore.CustomerCancelOrderItems(orderId, sellerId, orderItemIds))
             {
@@ -363,7 +363,7 @@ public async override Task ProcessCustomerCancellation(OrderIdComponents orderId
             }
         }
 
-        public async override Task ProcessOrderProposalCustomerRejection(OrderIdComponents orderId, SellerIdComponents sellerId, OrderIdTemplate orderIdTemplate)
+        public override async Task ProcessOrderProposalCustomerRejection(OrderIdComponents orderId, SellerIdComponents sellerId, OrderIdTemplate orderIdTemplate)
         {
             if (!await storeBookingEngineSettings.OrderStore.CustomerRejectOrderProposal(orderId, sellerId))
             {
@@ -371,12 +371,12 @@ public async override Task ProcessOrderProposalCustomerRejection(OrderIdComponen
             }
         }
 
-        protected async override Task<DeleteOrderResult> ProcessOrderDeletion(OrderIdComponents orderId, SellerIdComponents sellerId)
+        protected override async Task<DeleteOrderResult> ProcessOrderDeletion(OrderIdComponents orderId, SellerIdComponents sellerId)
         {
             return await storeBookingEngineSettings.OrderStore.DeleteOrder(orderId, sellerId);
         }
 
-        protected async override Task ProcessOrderQuoteDeletion(OrderIdComponents orderId, SellerIdComponents sellerId)
+        protected override async Task ProcessOrderQuoteDeletion(OrderIdComponents orderId, SellerIdComponents sellerId)
         {
             await storeBookingEngineSettings.OrderStore.DeleteLease(orderId, sellerId);
         }
@@ -433,7 +433,7 @@ private static void CheckOrderIntegrity(Order requestOrder, Order responseOrder)
             }
         }
 
-        protected async override Task<Order> ProcessGetOrderStatus(OrderIdComponents orderId, SellerIdComponents sellerIdComponents, ILegalEntity seller)
+        protected override async Task<Order> ProcessGetOrderStatus(OrderIdComponents orderId, SellerIdComponents sellerIdComponents, ILegalEntity seller)
         {
             // Get Order without OrderItems expanded
             var order = await storeBookingEngineSettings.OrderStore.GetOrderStatus(orderId, sellerIdComponents, seller);
@@ -468,7 +468,7 @@ protected async override Task<Order> ProcessGetOrderStatus(OrderIdComponents ord
             return order;
         }
 
-        public async override Task<Order> ProcessOrderCreationFromOrderProposal(OrderIdComponents orderId, OrderIdTemplate orderIdTemplate, ILegalEntity seller, SellerIdComponents sellerId, Order order)
+        public override async Task<Order> ProcessOrderCreationFromOrderProposal(OrderIdComponents orderId, OrderIdTemplate orderIdTemplate, ILegalEntity seller, SellerIdComponents sellerId, Order order)
         {
             if (!await storeBookingEngineSettings.OrderStore.CreateOrderFromOrderProposal(orderId, sellerId, order.OrderProposalVersion, order))
             {
@@ -650,7 +650,7 @@ public void AugmentWithOpenBookingPrepaymentConflictErrors(List<IOrderItemContex
             }
         }
 
-        public async override Task<TOrder> ProcessFlowRequest<TOrder>(BookingFlowContext request, TOrder order)
+        public override async Task<TOrder> ProcessFlowRequest<TOrder>(BookingFlowContext request, TOrder order)
         {
             var flowContext = AugmentContextFromOrder(request, order);
 
diff --git a/OpenActive.Server.NET/StoreBookingEngine/Stores/OpportunityStore.cs b/OpenActive.Server.NET/StoreBookingEngine/Stores/OpportunityStore.cs
index 2efec0c0..eb741b78 100644
--- a/OpenActive.Server.NET/StoreBookingEngine/Stores/OpportunityStore.cs
+++ b/OpenActive.Server.NET/StoreBookingEngine/Stores/OpportunityStore.cs
@@ -1,7 +1,6 @@
 using OpenActive.DatasetSite.NET;
 using OpenActive.NET;
 using OpenActive.Server.NET.OpenBookingHelper;
-using OpenActive.Server.NET.StoreBooking;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/OpenActive.Server.NET/StoreBookingEngine/Stores/OrderStore.cs b/OpenActive.Server.NET/StoreBookingEngine/Stores/OrderStore.cs
index 296481a9..220ff538 100644
--- a/OpenActive.Server.NET/StoreBookingEngine/Stores/OrderStore.cs
+++ b/OpenActive.Server.NET/StoreBookingEngine/Stores/OrderStore.cs
@@ -2,7 +2,6 @@
 using OpenActive.Server.NET.OpenBookingHelper;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace OpenActive.Server.NET.StoreBooking