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..227df37a 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;
@@ -82,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". 
@@ -124,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);
@@ -144,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));
@@ -166,7 +157,6 @@ public async Task<IActionResult> Login(LoginInputModel model, string button)
             var vm = await BuildLoginViewModelAsync(model);
             return View(vm);
         }
-
         
         /// <summary>
         /// Show logout page
@@ -218,7 +208,7 @@ public async Task<IActionResult> Logout(LogoutInputModel model)
                 return SignOut(new AuthenticationProperties { RedirectUri = url }, vm.ExternalAuthenticationScheme);
             }
 
-            return View("LoggedOut", vm);
+            return Redirect("/");
         }
 
         [HttpGet]
@@ -227,7 +217,6 @@ public IActionResult AccessDenied()
             return View();
         }
 
-
         /*****************************************/
         /* helper APIs for the AccountController */
         /*****************************************/
@@ -243,7 +232,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
                 {
                     EnableLocalLogin = local,
                     ReturnUrl = returnUrl,
-                    Username = context?.LoginHint
+                    Username = context.LoginHint
                 };
 
                 if (!local)
@@ -332,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/Account/AccountOptions.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountOptions.cs
index f191706c..dc2e640e 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountOptions.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Account/AccountOptions.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 System;
 
 namespace src
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Client/ClientRegistrationController.cs
index b974de5f..ba0201d5 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,59 +31,46 @@ 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);
+            var bookingPartner = await BookingPartnerTable.GetByInitialAccessToken(registrationKey);
             if (bookingPartner == null)
                 return Unauthorized("Initial Access Token is not valid, or is expired");
 
             bookingPartner.Registered = true;
             bookingPartner.ClientSecret = key.Sha256();
             bookingPartner.Name = model.ClientName;
-            bookingPartner.ClientProperties = new OpenActive.FakeDatabase.NET.ClientModel
-            {
-                ClientUri = model.ClientUri,
-                LogoUri = model.LogoUri,
-                GrantTypes = model.GrantTypes,
-                RedirectUris = model.RedirectUris,
-                Scope = model.Scope,
-            };
-            FakeBookingSystem.Database.SaveBookingPartner(bookingPartner);
+            bookingPartner.ClientUri = model.ClientUri;
+            bookingPartner.RestoreAccessUri = model.ClientRegistrationUri;
+            bookingPartner.LogoUri = model.LogoUri;
+            bookingPartner.GrantTypes = model.GrantTypes;
+            bookingPartner.RedirectUris = model.RedirectUris;
+            bookingPartner.Scope = model.Scope;
+
+            await BookingPartnerTable.Save(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 +83,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);
         }
     }
 
@@ -115,6 +96,9 @@ public class ClientRegistrationModel
         [JsonPropertyName(OidcConstants.ClientMetadata.ClientUri)]
         public string ClientUri { get; set; }
 
+        [JsonPropertyName(OidcConstants.ClientMetadata.InitiateLoginUris)]
+        public string ClientRegistrationUri { get; set; }
+
         [JsonPropertyName(OidcConstants.ClientMetadata.LogoUri)]
         public string LogoUri { get; set; }
 
@@ -122,7 +106,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..fe527385 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;
@@ -11,34 +9,36 @@ 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(this.ConvertToIS4Client(bookingPartner));
+            var bookingPartner = await BookingPartnerTable.GetByClientId(clientId);
+            return ConvertToIs4Client(bookingPartner);
         }
 
-        private Client ConvertToIS4Client(BookingPartnerTable bookingPartner)
+        private static 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,
                 ClientName = bookingPartner.Name,
-                AllowedGrantTypes = bookingPartner.ClientProperties?.GrantTypes == null ? new List<string>() : bookingPartner.ClientProperties.GrantTypes.ToList(),
-                ClientSecrets = bookingPartner.ClientSecret == null ? new List<Secret>() : new List<Secret>() { new Secret(bookingPartner.ClientSecret) },
-                AllowedScopes = bookingPartner.ClientProperties?.Scope == null ? new List<string>() : bookingPartner.ClientProperties.Scope.Split(' ').ToList(),
+                AllowedGrantTypes = bookingPartner.GrantTypes == null ? new List<string>() : bookingPartner.GrantTypes.ToList(),
+                ClientSecrets = bookingPartner.ClientSecret == null ? new List<Secret>() : new List<Secret> { new Secret(bookingPartner.ClientSecret) },
+                AllowedScopes = bookingPartner.Scope == null ? new List<string>() : bookingPartner.Scope.Split(' ').ToList(),
                 Claims = bookingPartner.ClientId == null ? new List<System.Security.Claims.Claim>() : new List<System.Security.Claims.Claim>() { new System.Security.Claims.Claim("https://openactive.io/clientId", bookingPartner.ClientId) },
                 ClientClaimsPrefix = "",
                 AlwaysSendClientClaims = true,
                 AlwaysIncludeUserClaimsInIdToken = true,
                 AllowOfflineAccess = true,
                 UpdateAccessTokenClaimsOnRefresh = true,
-                RedirectUris = bookingPartner.ClientProperties?.RedirectUris == null ? new List<string>() : bookingPartner.ClientProperties.RedirectUris.ToList(),
+                RedirectUris = bookingPartner.RedirectUris == null ? new List<string>() : bookingPartner.RedirectUris.ToList(),
                 RequireConsent = true,
                 RequirePkce = true,
-                LogoUri = bookingPartner.ClientProperties?.LogoUri,
-                ClientUri = bookingPartner.ClientProperties?.ClientUri
+                LogoUri = bookingPartner.LogoUri,
+                ClientUri = bookingPartner.ClientUri
             };
         }
     }
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs
index 26cb3e2e..127dcdeb 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnerViewModel.cs
@@ -1,16 +1,41 @@
 // 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;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace src
 {
     public class BookingPartnerViewModel
     {
         public IEnumerable<BookingPartnerModel> BookingPartners { get; set; }
+
+        public static async Task<BookingPartnerViewModel> Build(long? sellerUserId = null)
+        {
+            var bookingPartners = sellerUserId.HasValue
+                ? await BookingPartnerTable.GetBySellerUserId(sellerUserId.Value)
+                : await BookingPartnerTable.Get();
+            var list = (await Task.WhenAll(bookingPartners.Select(async bookingPartner =>
+            {
+                var bookingStatistics = await BookingStatistics.Get(bookingPartner.ClientId);
+                return new BookingPartnerModel
+                {
+                    ClientId = bookingPartner.ClientId,
+                    ClientName = bookingPartner.Name,
+                    ClientLogoUrl = bookingPartner.LogoUri,
+                    ClientUrl = bookingPartner.ClientUri,
+                    RestoreAccessUrl = bookingPartner.RestoreAccessUri,
+                    BookingPartner = bookingPartner,
+                    SellersEnabled = bookingStatistics.SellersEnabled,
+                    BookingsByBroker = bookingStatistics.BookingsByBroker
+                };
+            }))).ToList();
+
+            return new BookingPartnerViewModel { BookingPartners = list };
+        }
     }
 
     public class BookingPartnerModel
@@ -18,12 +43,14 @@ public class BookingPartnerModel
         public string ClientId { get; set; }
         public string ClientName { get; set; }
         public string ClientUrl { get; set; }
+        public string RestoreAccessUrl { get; set; }
         public string ClientLogoUrl { get; set; }
         public DateTime Created { get; set; }
         public DateTime? Expires { get; set; }
         public IEnumerable<string> IdentityGrantNames { get; set; }
         public IEnumerable<string> ApiGrantNames { get; set; }
         public BookingPartnerTable BookingPartner { get; set; }
+        public IDictionary<string, int> BookingsByBroker { get; set; }
+        public int SellersEnabled { 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..ff4e22a1 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/BookingPartnersController.cs
@@ -1,21 +1,15 @@
 // 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 IdentityServer;
 
 namespace src
@@ -25,48 +19,44 @@ namespace src
     /// </summary>
     [SecurityHeaders]
     [Authorize]
+    [Route("booking-partners")]
     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;
         }
 
-        /// <summary>
-        /// Show list of grants
-        /// </summary>
-        [HttpGet]
-        public async Task<IActionResult> Index()
+        [HttpGet("seller-admin")]
+        public async Task<IActionResult> SellerAdmin()
         {
-            return View("Index", await BuildViewModelAsync());
+            var sellerUserId = long.Parse(User.GetSubjectId());
+            return View("SellerAdmin", await BookingPartnerViewModel.Build(sellerUserId));
         }
 
-        /// <summary>
-        /// Show list of grants
-        /// </summary>
-        [HttpGet]
-        public async Task<IActionResult> Edit(string Id)
+        [HttpGet("sys-admin")]
+        public async Task<IActionResult> SysAdmin()
         {
-            var content = await BuildBookingPartnerViewModelAsync(Id);
-            if (content == null) return NotFound();
+            return View("SysAdmin", await BookingPartnerViewModel.Build());
+        }
+
+        [HttpGet("edit/{id}")]
+        public async Task<IActionResult> Edit(string id)
+        {
+            var content = await BuildBookingPartnerModel(id);
+            if (content == null)
+                return NotFound();
+
             return View("BookingPartnerEdit", content);
         }
 
-        /// <summary>
-        /// Show list of grants
-        /// </summary>
-        [HttpGet]
+        [HttpGet("create")]
         public async Task<IActionResult> Create()
         {
             return View("BookingPartnerCreate", await Task.FromResult(new BookingPartnerModel()));
@@ -75,11 +65,11 @@ public async Task<IActionResult> Create()
         /// <summary>
         /// Add a new booking partner
         /// </summary>
-        [HttpPost]
+        [HttpPost("create")]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> CreateBookingPartner(string email, string bookingPartnerName)
+        public async Task<IActionResult> Create([FromForm] string email, [FromForm] string bookingPartnerName)
         {
-            var newBookingPartner = new BookingPartnerTable()
+            var newBookingPartner = new BookingPartnerTable
             {
                 ClientId = Guid.NewGuid().ToString(),
                 Name = bookingPartnerName,
@@ -92,112 +82,97 @@ public async Task<IActionResult> CreateBookingPartner(string email, string booki
                 BookingsSuspended = false
             };
 
-            FakeBookingSystem.Database.AddBookingPartner(newBookingPartner);
+            await BookingPartnerTable.Add(newBookingPartner);
+            return Redirect($"/booking-partners/edit/{newBookingPartner.ClientId}");
+        }
+
+        /// <summary>
+        /// Handle postback to remove a client
+        /// </summary>
+        [HttpPost("remove")]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Remove([FromForm] string clientId)
+        {
+            await _interaction.RevokeUserConsentAsync(clientId);
+            await _events.RaiseAsync(new GrantsRevokedEvent(User.GetSubjectId(), clientId));
 
-            return View("BookingPartnerEdit", await BuildBookingPartnerViewModelAsync(newBookingPartner.ClientId));
+            return Redirect("/booking-partners/seller-admin");
         }
 
         /// <summary>
-        /// Handle postback to revoke a client
+        /// Handle postback to delete a client
         /// </summary>
-        [HttpPost]
+        [HttpPost("delete")]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Revoke(string clientId)
+        public async Task<IActionResult> Delete([FromForm] string clientId)
         {
             await _interaction.RevokeUserConsentAsync(clientId);
+            await FakeBookingSystem.Database.DeleteBookingPartner(clientId);
             await _events.RaiseAsync(new GrantsRevokedEvent(User.GetSubjectId(), clientId));
 
-            return RedirectToAction("Index");
+            return Redirect("/booking-partners/sys-admin");
         }
 
         /// <summary>
         /// Handle postback to suspend a client
         /// </summary>
-        [HttpPost]
+        [HttpPost("suspend")]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Suspend(string clientId)
+        public async Task<IActionResult> Suspend([FromForm] string clientId)
         {
             var client = await _clients.FindClientByIdAsync(clientId);
             client.AllowedScopes.Remove("openactive-openbooking");
             await _events.RaiseAsync(new GrantsRevokedEvent(User.GetSubjectId(), clientId));
 
-            FakeBookingSystem.Database.UpdateBookingPartnerScope(
-                clientId,
-                "openid profile openactive-ordersfeed",
-                true
-                );
-
-            return RedirectToAction("Index");
+            await BookingPartnerTable.UpdateScope(clientId, "openid profile openactive-ordersfeed", true);
+            return Redirect("/booking-partners/seller-admin");
         }
 
         /// <summary>
         /// Handle postback to generate a registration key
         /// </summary>
-        [HttpPost]
+        [HttpPost("regenerate-key")]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> RegenerateKey(string clientId)
+        public async Task<IActionResult> RegenerateKey([FromForm] string clientId)
         {
-            var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
-            FakeBookingSystem.Database.SetBookingPartnerKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
+            var bookingPartner = await BookingPartnerTable.GetByClientId(clientId);
+            await BookingPartnerTable.SetKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
 
-            return View("BookingPartnerEdit", await BuildBookingPartnerViewModelAsync(clientId));
+            return Redirect($"/booking-partners/edit/{clientId}");
         }
 
         /// <summary>
         /// Handle postback to generate a registration key, and a new client secret
         /// </summary>
-        [HttpPost]
+        [HttpPost("regenerate-all-keys")]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> RegenerateAllKeys(string clientId)
+        public async Task<IActionResult> RegenerateAllKeys([FromForm] string clientId)
         {
-            var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
-            FakeBookingSystem.Database.ResetBookingPartnerKey(clientId, KeyGenerator.GenerateInitialAccessToken(bookingPartner.Name));
+            var bookingPartner = await BookingPartnerTable.GetByClientId(clientId);
+            await BookingPartnerTable.ResetKey(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", await BuildBookingPartnerViewModelAsync(clientId));
+            return Redirect($"/booking-partners/edit/{clientId}");
         }
 
-        private async Task<BookingPartnerModel> BuildBookingPartnerViewModelAsync(string clientId)
+        private static async Task<BookingPartnerModel> BuildBookingPartnerModel(string clientId)
         {
             // var client = await _clients.FindClientByIdAsync(clientId);
-            var bookingPartner = FakeBookingSystem.Database.GetBookingPartner(clientId);
+            var bookingPartner = await BookingPartnerTable.GetByClientId(clientId);
+            if (bookingPartner == null)
+                return null;
 
-            if (bookingPartner == null) return null;
-
-            return new BookingPartnerModel()
+            return new BookingPartnerModel
             {
                 ClientId = bookingPartner.ClientId,
                 ClientName = bookingPartner.Name,
-                ClientLogoUrl = bookingPartner.ClientProperties?.LogoUri,
-                ClientUrl = bookingPartner.ClientProperties?.ClientUri,
+                ClientLogoUrl = bookingPartner.LogoUri,
+                ClientUrl = bookingPartner.ClientUri,
                 BookingPartner = bookingPartner
             };
         }
-        private async Task<BookingPartnerViewModel> BuildViewModelAsync()
-        {
-            var bookingPartners = FakeBookingSystem.Database.GetBookingPartners();
-            var list = new List<BookingPartnerModel>();
-            foreach (var bookingPartner in bookingPartners)
-            {
-                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
-            };
-        }
     }
 }
\ 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..0f50aca9 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;
@@ -10,32 +9,28 @@ 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);
-
-            List<PersistedGrant> persistedGrants = new List<PersistedGrant>();
-            foreach(var grant in grants)
+            var grants = await FakeBookingSystem.Database.GetAllGrants(subjectId);
+            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
-                });
-            }
-            return Task.FromResult<IEnumerable<PersistedGrant>>(persistedGrants);
+                Key = grant.Key,
+                Type = grant.Type,
+                SubjectId = grant.SubjectId,
+                ClientId = grant.ClientId,
+                CreationTime = grant.CreationTime,
+                Expiration = grant.Expiration,
+                Data = grant.Data
+            }).ToList();
+
+            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,
@@ -44,27 +39,31 @@ public Task<PersistedGrant> GetAsync(string key)
                 CreationTime = grant.CreationTime,
                 Expiration = grant.Expiration,
                 Data = grant.Data
-            } : null);
+            } : 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..08756234 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
@@ -40,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);
@@ -57,13 +52,10 @@ public virtual Task GetProfileDataAsync(ProfileDataRequestContext context)
                     {
                         context.IssuedClaims.Add(sellerIdClaim);
                     }
-
                 }
             }
 
             context.LogIssuedClaims(Logger);
-
-            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -72,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/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..2900161a 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/Interfaces.cs
@@ -1,15 +1,11 @@
-using OpenActive.FakeDatabase.NET;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+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 95224345..07025669 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
@@ -16,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 09a9bcc8..ae3b5089 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
@@ -1,8 +1,5 @@
-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;
 
@@ -10,33 +7,28 @@ 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
@@ -58,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.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/Account/LoggedOut.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Account/LoggedOut.cshtml
deleted file mode 100644
index 99599c0c..00000000
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Account/LoggedOut.cshtml
+++ /dev/null
@@ -1,34 +0,0 @@
-@model LoggedOutViewModel
-
-@{ 
-    // set this so the layout rendering sees an anonymous user
-    ViewData["signed-out"] = true;
-}
-
-<div class="page-header logged-out">
-    <h1>
-        Logout
-        <small>You are now logged out</small>
-    </h1>
-
-    @if (Model.PostLogoutRedirectUri != null)
-    {
-        <div>
-            Click <a class="PostLogoutRedirectUri" href="@Model.PostLogoutRedirectUri">here</a> to return to the
-            <span>@Model.ClientName</span> application.
-        </div>
-    }
-
-    @if (Model.SignOutIframeUrl != null)
-    {
-        <iframe width="0" height="0" class="signout" src="@Model.SignOutIframeUrl"></iframe>
-    }
-</div>
-
-@section scripts
-{
-    @if (Model.AutomaticRedirectAfterSignOut)
-    {
-        <script src="~/js/signout-redirect.js"></script>
-    }
-}
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Account/Login.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Account/Login.cshtml
index 5905626e..1e69d86c 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Account/Login.cshtml
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Account/Login.cshtml
@@ -1,3 +1,4 @@
+@using OpenActive.FakeDatabase.NET
 @model LoginViewModel
 
 <div class="login-page">
@@ -8,7 +9,6 @@
     <partial name="_ValidationSummary" />
 
     <div class="row">
-
         @if (Model.EnableLocalLogin)
         {
             <div class="col-sm-6">
@@ -17,7 +17,6 @@
                         <h3 class="panel-title">Local Login</h3>
                     </div>
                     <div class="panel-body">
-
                         <form asp-route="Login">
                             <input type="hidden" asp-for="ReturnUrl" />
 
@@ -85,4 +84,20 @@
             </div>
         }
     </div>
+
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">Test credentials</h3>
+                </div>
+                <div class="panel-body">
+                    @foreach (var seller in FakeDatabase.DefaultSellerUsers)
+                    {
+                        <div>@seller.Username &#8594; @seller.PasswordRaw</div>
+                    }
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerCreate.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerCreate.cshtml
index b010dae8..b4069a94 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerCreate.cshtml
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerCreate.cshtml
@@ -1,42 +1,42 @@
 @model BookingPartnerModel
-@using System;
 
-    <div class="partner container">
-        <div class="row page-header">
-            <div class="col-sm-10">
-                <h1>
-                    New Booking Partner
-                </h1>
-            </div>
+<div class="partner container">
+    <div class="row page-header">
+        <div class="col-sm-10">
+            <h1>
+                New Booking Partner
+            </h1>
         </div>
-        <form asp-action="CreateBookingPartner" class="form-horizontal">
-            <div class="row">
-                    <div class="form-group">
-                        <div class="col-sm-2">
-                            <label for="emailAddress" class="control-label">Email address</label>
-                        </div>
-                        <div class="col-sm-6">
-                            <input type="email" class="form-control" id="emailAddress" name="email">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-sm-2">
-                            <label for="bookingPartnerName" class="control-label">Booking Partner Name</label>
-                        </div>
-                        <div class="col-sm-6">
-                            <input type="text" class="form-control" id="bookingPartnerName" name="bookingPartnerName">
-                        </div>
-                    </div>
+    </div>
+    <form action="/booking-partners/create" method="post" class="form-horizontal">
+        @Html.AntiForgeryToken()
+        <div class="row">
+            <div class="form-group">
+                <div class="col-sm-2">
+                    <label for="emailAddress" class="control-label">Email address</label>
+                </div>
+                <div class="col-sm-6">
+                    <input type="email" class="form-control" id="emailAddress" name="email">
+                </div>
             </div>
-            <hr />
+            <div class="form-group">
+                <div class="col-sm-2">
+                    <label for="bookingPartnerName" class="control-label">Booking Partner Name</label>
+                </div>
+                <div class="col-sm-6">
+                    <input type="text" class="form-control" id="bookingPartnerName" name="bookingPartnerName">
+                </div>
+            </div>
+        </div>
+        <hr/>
 
-            <div class="row">
-                <div class="col-sm-8 text-center">
+        <div class="row">
+            <div class="col-sm-8 text-center">
 
-                    <button class="btn btn-md btn-default">Create</button>
+                <button class="btn btn-md btn-default">Create</button>
 
-                    <a class="btn btn-md btn-default" href="~/bookingpartners">Cancel</a>
-                </div>
+                <a class="btn btn-md btn-default" href="/booking-partners/seller-admin">Cancel</a>
             </div>
-        </form>
-    </div>
\ No newline at end of file
+        </div>
+    </form>
+</div>
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerEdit.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/BookingPartnerEdit.cshtml
index 7384d7cd..c6183e01 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>
@@ -34,16 +33,14 @@
                     <div class="col-sm-4">
                         <input type="text" class="form-control" id="registrationKey" value="@(Model.BookingPartner.InitialAccessTokenKeyValidUntil > DateTime.Now ? Model.BookingPartner.InitialAccessToken : "EXPIRED" )" disabled>
                     </div>
-                    <div class="col-sm-2">
-                        <button class="btn btn-md btn-default">Copy</button>
-                    </div>
                 </div>
             </form>
         </div>
         <hr />
         <div class="row pb-10">
             <div class="col-sm-3">
-                <form asp-action="RegenerateKey">
+                <form action="/booking-partners/regenerate-key" method="post">
+                    @Html.AntiForgeryToken()
                     <input type="hidden" name="clientId" value="@Model.BookingPartner.ClientId">
                     <button class="btn btn-md btn-default">Generate New Registration Key</button>
                 </form>
@@ -54,7 +51,8 @@
         </div>
         <div class="row pb-40">
             <div class="col-sm-3">
-                <form asp-action="RegenerateAllKeys">
+                <form action="/booking-partners/regenerate-all-keys" method="post">
+                    @Html.AntiForgeryToken()
                     <input type="hidden" name="clientId" value="@Model.BookingPartner.ClientId">
                     <button class="btn btn-md btn-default">Regenerate all Keys</button>
                 </form>
@@ -65,7 +63,7 @@
         </div>
         <div class="row">
             <div class="col-sm-8 text-center">
-                <a class="btn btn-md btn-default" href="~/bookingpartners">Close</a>
+                <a class="btn btn-md btn-default" href="/booking-partners/sys-admin">Close</a>
             </div>
         </div>
     </div>
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/Index.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/Index.cshtml
deleted file mode 100644
index cb097ef0..00000000
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/Index.cshtml
+++ /dev/null
@@ -1,79 +0,0 @@
-@model BookingPartnerViewModel
-
-<div class="grants">
-    <div class="row page-header">
-        <div class="col-sm-10">
-            <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">
-            <div class="col-sm-8">
-                <div class="alert alert-info">
-                    You have not given access to any applications
-                </div>
-            </div>
-        </div>
-    }
-    else
-    {
-        foreach (var bookingPartner in Model.BookingPartners)
-        {
-            <div class="row grant">
-                <div class="col-sm-2">
-                    <div class="clientname">@bookingPartner.ClientName</div>
-                </div>
-                <div class="col-sm-2">
-                    <a class="btn btn-md btn-default" href="@bookingPartner.ClientUrl" target="_blank">Manage</a>
-                </div>
-                <div class="col-sm-2">
-                    @if (bookingPartner.BookingPartner.BookingsSuspended)
-                    {
-                        <small class="warning">Bookings suspended</small>
-                    }
-                    @if (!bookingPartner.BookingPartner.Registered)
-                    {
-                        <small>Pending registration</small>
-                    }
-                </div>
-
-                <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>
-                    </form>
-                    @if (bookingPartner.BookingPartner.Registered && !bookingPartner.BookingPartner.BookingsSuspended)
-                    {
-                        <form asp-action="Suspend">
-                            <input type="hidden" name="clientId" value="@bookingPartner.ClientId">
-                            <button class="btn btn-md btn-default">Suspend Bookings</button>
-                        </form>
-                    }
-                    @if (bookingPartner.BookingPartner.Registered && bookingPartner.BookingPartner.BookingsSuspended)
-                    {
-                        <form asp-action="Restore">
-                            <input type="hidden" name="clientId" value="@bookingPartner.ClientId">
-                            <button class="btn btn-md btn-default">Restore</button>
-                        </form>
-                    }
-                    @if (!bookingPartner.BookingPartner.Registered || bookingPartner.BookingPartner.BookingsSuspended)
-                    {
-                        <form asp-action="Revoke">
-                            <input type="hidden" name="clientId" value="@bookingPartner.ClientId">
-                            <button class="btn btn-md btn-default">Revoke Access</button>
-                        </form>
-                    }
-                </div>
-            </div>
-        }
-    }
-</div>
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/SellerAdmin.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/SellerAdmin.cshtml
new file mode 100644
index 00000000..e055a271
--- /dev/null
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/SellerAdmin.cshtml
@@ -0,0 +1,69 @@
+@model BookingPartnerViewModel
+
+<div class="grants">
+    <div class="row page-header">
+        <h1>Seller Administration</h1>
+        <div>Below is the list of your approved booking partners.</div>
+    </div>
+
+    <div class="row">
+        @if (Model.BookingPartners.Any() == false)
+        {
+            <div class="alert alert-info">
+                You have not given access to any booking partners
+            </div>
+        }
+        else
+        {
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <td>Booking partner</td>
+                        <td>Bookings by broker / last 30 days</td>
+                        <td></td>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var bookingPartner in Model.BookingPartners)
+                    {
+                        <tr>
+                            <td>@bookingPartner.ClientName</td>
+                            <td>
+                                @foreach (var (broker, orderCount) in bookingPartner.BookingsByBroker)
+                                {
+                                    <div>@broker: @orderCount</div>
+                                }
+                            </td>
+                            <td>
+                                <a class="btn btn-md btn-default" href="@bookingPartner.ClientUrl" @(string.IsNullOrWhiteSpace(bookingPartner.ClientUrl) ? "disabled" : "")>Manage</a>
+
+                                @if (bookingPartner.BookingPartner.Registered && !bookingPartner.BookingPartner.BookingsSuspended)
+                                {
+                                    <form action="/booking-partners/suspend" method="post">
+                                        @Html.AntiForgeryToken()
+                                        <input type="hidden" name="clientId" value="@bookingPartner.ClientId">
+                                        <button class="btn btn-md btn-default btn-suspend-bookings">Suspend Bookings</button>
+                                    </form>
+                                }
+
+                                @if (bookingPartner.BookingPartner.Registered && bookingPartner.BookingPartner.BookingsSuspended)
+                                {
+                                    <a class="btn btn-md btn-default" href="@bookingPartner.RestoreAccessUrl" @(string.IsNullOrWhiteSpace(bookingPartner.RestoreAccessUrl) ? "disabled" : "")>Restore</a>
+                                }
+
+                                @if (!bookingPartner.BookingPartner.Registered || bookingPartner.BookingPartner.BookingsSuspended)
+                                {
+                                    <form action="/booking-partners/remove" method="post">
+                                        @Html.AntiForgeryToken()
+                                        <input type="hidden" name="clientId" value="@bookingPartner.ClientId">
+                                        <button class="btn btn-md btn-default">Remove</button>
+                                    </form>
+                                }
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        }
+    </div>
+</div>
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/SysAdmin.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/SysAdmin.cshtml
new file mode 100644
index 00000000..91c8eca7
--- /dev/null
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/BookingPartners/SysAdmin.cshtml
@@ -0,0 +1,60 @@
+@model BookingPartnerViewModel
+
+<div class="grants">
+    <div class="row page-header">
+        <h1>System Administration</h1>
+        <div>Below is the list of all booking partners registered as OAuth clients.</div>
+    </div>
+
+    <div class="row">
+        @if (!Model.BookingPartners.Any())
+        {
+            <div class="alert alert-info">
+                There are no booking partners in the system
+            </div>
+        }
+        else
+        {
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <td>Booking partner</td>
+                        <td>Sellers enabled</td>
+                        <td>Bookings by broker / last 30 days</td>
+                        <td>
+                            <a href="/booking-partners/create" class="btn btn-md btn-default"><b class="glyphicon glyphicon-plus"></b>&nbsp;Add a Booking Partner</a>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var bookingPartner in Model.BookingPartners)
+                    {
+                        <tr>
+                            <td>@bookingPartner.ClientName</td>
+                            <td>@bookingPartner.SellersEnabled</td>
+                            <td>
+                                @foreach (var (broker, orderCount) in bookingPartner.BookingsByBroker)
+                                {
+                                    <div>@broker: @orderCount</div>
+                                }
+                            </td>
+                            <td>
+                                <form action="/booking-partners/manage-keys" method="post">
+                                    @Html.AntiForgeryToken()
+                                    <input type="hidden" name="clientId" value="@bookingPartner.ClientId">
+                                    <a href="/booking-partners/edit/@bookingPartner.ClientId" class="btn btn-md btn-default">API Key</a>
+                                </form>
+
+                                <form action="/booking-partners/delete" method="post">
+                                    @Html.AntiForgeryToken()
+                                    <input type="hidden" name="clientId" value="@bookingPartner.ClientId">
+                                    <button class="btn btn-md btn-default">Delete</button>
+                                </form>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        }
+    </div>
+</div>
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Home/Index.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Home/Index.cshtml
index 4ca48908..94d6f659 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Home/Index.cshtml
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Home/Index.cshtml
@@ -6,9 +6,8 @@
     <div class="row page-header">
         <div class="col-sm-10">
             <h1>
-                <img class="icon" src="~/icon.jpg">
-                Welcome to IdentityServer4
-                <small>(version @version)</small>
+                <img class="icon" src="~/icon.jpg" alt="Lorem Fitsum">
+                Welcome to Lorem Fitsum
             </h1>
         </div>
     </div>
@@ -16,7 +15,7 @@
     <div class="row">
         <div class="col-sm-8">
             <p>
-                Click <a href="~/bookingpartners">here</a> to manage booking partners.
+                Click <a href="/booking-partners/seller-admin">here</a> to manage booking partners.
             </p>
         </div>
     </div>
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Shared/_Layout.cshtml b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Shared/_Layout.cshtml
index 94c3f73b..95350008 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Shared/_Layout.cshtml
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Views/Shared/_Layout.cshtml
@@ -7,12 +7,12 @@
     }
 }
 <!DOCTYPE html>
-<html>
+<html lang="en-GB">
 <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>IdentityServer4</title>
+    <title>Lorem Fitsum</title>
     <link rel="icon" type="image/x-icon" href="~/favicon.ico" />
     <link rel="shortcut icon" type="image/x-icon" href="~/favicon.ico" />
     <link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.css" />
@@ -31,15 +31,25 @@
                 </button>
                 <a href="~/">
                     <span class="navbar-brand">
-                        <img src="~/icon.png" class="icon-banner">
-                        IdentityServer4
+                        <img src="~/icon.png" class="icon-banner" alt="Lorem Fitsum">
+                        Lorem Fitsum
                     </span>
                 </a>
             </div>
 
+            <ul class="nav navbar-nav">
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Booking partners <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="/booking-partners/seller-admin">Seller admin</a></li>
+                        <li><a href="/booking-partners/sys-admin">System admin</a></li>
+                    </ul>
+                </li>
+            </ul>
+
             @if (!string.IsNullOrWhiteSpace(name))
             {
-                <ul class="nav navbar-nav">
+                <ul class="nav navbar-nav navbar-right">
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">@name <b class="caret"></b></a>
                         <ul class="dropdown-menu">
@@ -57,6 +67,6 @@
 
     <script src="~/lib/jquery/jquery.js"></script>
     <script src="~/lib/bootstrap/js/bootstrap.js"></script>
-    @RenderSection("scripts", required: false)
+    @await RenderSectionAsync("scripts", required: false)
 </body>
 </html>
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/wwwroot/css/site.css b/Examples/BookingSystem.AspNetCore.IdentityServer/wwwroot/css/site.css
index a0bbbeda..b101bbb8 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/wwwroot/css/site.css
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/wwwroot/css/site.css
@@ -79,4 +79,7 @@
 }
 .grants .grant li:last-child:after {
   content: '';
+}
+.btn-suspend-bookings {
+  width: 157px; /* ToDo: do this better */
 }
\ No newline at end of file
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/DatabaseTables.cs b/Fakes/OpenActive.FakeDatabase.NET/DatabaseTables.cs
deleted file mode 100644
index aca2109a..00000000
--- a/Fakes/OpenActive.FakeDatabase.NET/DatabaseTables.cs
+++ /dev/null
@@ -1,274 +0,0 @@
-using System;
-using System.Collections.Generic;
-using ServiceStack.DataAnnotations;
-using ServiceStack.OrmLite;
-
-namespace OpenActive.FakeDatabase.NET
-{
-    public enum BrokerRole { AgentBroker, ResellerBroker, NoBroker }
-
-    public enum BookingStatus { None, CustomerCancelled, SellerCancelled, Confirmed, Attended, Absent }
-
-    public enum ProposalStatus { AwaitingSellerConfirmation, SellerAccepted, SellerRejected, CustomerRejected }
-
-    public enum FeedVisibility { None, Visible, Archived }
-
-    public enum OrderMode { Lease, Proposal, Booking }
-
-    public enum RequiredStatusType { Required, Optional, Unavailable }
-
-    public enum AttendanceMode { Offline, Online, Mixed }
-
-    public enum AdditionalDetailTypes { Age, PhotoConsent, Experience, Gender, FileUpload }
-
-    [CompositeIndex(nameof(Modified), nameof(Id))]
-    public abstract class Table
-    {
-        [PrimaryKey]
-        [AutoIncrement]
-        public long Id { get; set; }
-        public bool Deleted { get; set; }
-        public long Modified { get; set; } = new DateTimeOffset(DateTime.Today).UtcTicks;
-    }
-
-    public class ClassTable : Table
-    {
-        public string TestDatasetIdentifier { get; set; }
-        public string Title { get; set; }
-        [Reference]
-        public SellerTable SellerTable { get; set; }
-        [ForeignKey(typeof(SellerTable), OnDelete = "CASCADE")]
-        public long SellerId { get; set; }
-        public decimal? Price { get; set; }
-        public RequiredStatusType? Prepayment { get; set; }
-        public bool RequiresAttendeeValidation { get; set; }
-        public bool RequiresAdditionalDetails { get; set; }
-        public List<AdditionalDetailTypes> RequiredAdditionalDetails { get; set; }
-        public bool AllowCustomerCancellationFullRefund { get; set; }
-        public bool RequiresApproval { get; set; }
-        public TimeSpan? ValidFromBeforeStartDate { get; set; }
-        public TimeSpan? LatestCancellationBeforeStartDate { get; set; }
-        public decimal LocationLat { get; set; }
-        public decimal LocationLng { get; set; }
-        public AttendanceMode AttendanceMode { get; set; }
-        public bool AllowsProposalAmendment { get; set; }
-    }
-
-    public class OccurrenceTable : Table
-    {
-        public string TestDatasetIdentifier { get; set; }
-        [Reference]
-        public ClassTable ClassTable { get; set; }
-        [ForeignKey(typeof(ClassTable), OnDelete = "CASCADE")]
-        public long ClassId { get; set; }
-        public DateTime Start { get; set; }
-        public DateTime End { get; set; }
-        public long TotalSpaces { get; set; }
-        public long LeasedSpaces { get; set; }
-        public long RemainingSpaces { get; set; }
-    }
-
-
-    public class OrderItemsTable : Table
-    {
-        public string ClientId { get; internal set; }
-        public Uri OpportunityJsonLdId { get; set; }
-        public Uri OfferJsonLdId { get; set; }
-        [Reference]
-        public OrderTable OrderTable { get; set; }
-        [ForeignKey(typeof(OrderTable), OnDelete = "CASCADE")]
-        public string OrderId { get; set; }
-        [Reference]
-        public OccurrenceTable OccurrenceTable { get; set; }
-        [ForeignKey(typeof(OccurrenceTable), OnDelete = "CASCADE")]
-        public long? OccurrenceId { get; set; }
-        [Reference]
-        public SlotTable SlotTable { get; set; }
-        [ForeignKey(typeof(SlotTable), OnDelete = "CASCADE")]
-        public long? SlotId { get; set; }
-        public BookingStatus Status { get; set; }
-        public string CancellationMessage { get; set; }
-        public decimal Price { get; set; }
-        public string PinCode { get; set; }
-        public string ImageUrl { get; set; }
-        public string BarCodeText { get; set; }
-        public string CustomerNotice { get; set; }
-        public Uri MeetingUrl { get; set; }
-        public string MeetingId { get; set; }
-        public string MeetingPassword { get; set; }
-    }
-
-    [CompositeIndex(nameof(OrderModified), nameof(OrderId))]
-    [CompositeIndex(nameof(OrderProposalModified), nameof(OrderId))]
-    public class OrderTable
-    {
-        /**
-         * Note string type is used for the OrderId instead of Guid type to allow for correct ordering of GUIDs for the RPDE feed
-         */
-        [PrimaryKey]
-        public string OrderId { get; set; }
-
-        public bool Deleted { get; set; }
-        public long OrderModified { get; set; } = DateTimeOffset.Now.UtcTicks;
-        public long OrderProposalModified { get; set; } = DateTimeOffset.Now.UtcTicks;
-        public string ClientId { get; set; }
-
-        [Reference]
-        public SellerTable SellerTable { get; set; }
-        [ForeignKey(typeof(SellerTable), OnDelete = "CASCADE")]
-        public long SellerId { get; set; }
-        public bool? CustomerIsOrganization { get; set; }
-        public CustomerType CustomerType { get; set; }
-        public BrokerRole BrokerRole { get; set; }
-        public string BrokerName { get; set; }
-        public Uri BrokerUrl { get; set; }
-        public string BrokerTelephone { get; set; }
-        public string CustomerEmail { get; set; }
-        public string CustomerIdentifier { get; set; }
-        public string CustomerGivenName { get; set; }
-        public string CustomerFamilyName { get; set; }
-        public string CustomerTelephone { get; set; }
-        public string CustomerOrganizationName { get; set; }
-        public string PaymentIdentifier { get; set; }
-        public string PaymentName { get; set; }
-        public string PaymentProviderId { get; set; }
-        public string PaymentAccountId { get; set; }
-        public decimal TotalOrderPrice { get; set; }
-        public OrderMode OrderMode { get; set; }
-        public DateTime LeaseExpires { get; set; }
-        public FeedVisibility VisibleInOrdersFeed { get; set; }
-        public FeedVisibility VisibleInOrderProposalsFeed { get; set; }
-        public ProposalStatus? ProposalStatus { get; set; }
-        public Guid? ProposalVersionId { get; set; }
-    }
-
-    public class SellerTable
-    {
-        [PrimaryKey]
-        public long Id { get; set; }
-        public string Name { get; set; }
-        public bool IsIndividual { get; set; }
-        public string Url { get; set; }
-        public bool IsTaxGross { get; set; }
-        public string LogoUrl { get; set; }
-    }
-
-    public class SellerUserTable
-    {
-        [PrimaryKey]
-        public long Id { get; set; }
-        public string Username { get; set; }
-        public string PasswordHash { get; set; }
-
-        [Reference]
-        public SellerTable SellerTable { get; set; }
-        [ForeignKey(typeof(SellerTable), OnDelete = "CASCADE")]
-        public long SellerId { get; set; }
-    }
-
-    public class SlotTable : Table
-    {
-        public string TestDatasetIdentifier { get; set; }
-        [Reference]
-        public FacilityUseTable FacilityUseTable { get; set; }
-        [ForeignKey(typeof(FacilityUseTable), OnDelete = "CASCADE")]
-        public long FacilityUseId { get; set; }
-        public DateTime Start { get; set; }
-        public DateTime End { get; set; }
-        public long MaximumUses { get; set; }
-        public long LeasedUses { get; set; }
-        public long RemainingUses { get; set; }
-        public decimal? Price { get; set; }
-        public bool AllowCustomerCancellationFullRefund { get; set; }
-        public RequiredStatusType? Prepayment { get; set; }
-        public bool RequiresAttendeeValidation { get; set; }
-        public bool RequiresApproval { get; set; }
-        public bool RequiresAdditionalDetails { get; set; }
-        public List<AdditionalDetailTypes> RequiredAdditionalDetails { get; set; }
-        public TimeSpan? ValidFromBeforeStartDate { get; set; }
-        public TimeSpan? LatestCancellationBeforeStartDate { get; set; }
-        public bool AllowsProposalAmendment { get; set; }
-    }
-
-    public class FacilityUseTable : Table
-    {
-        public string TestDatasetIdentifier { get; set; }
-        public string Name { get; set; }
-        public string Description { get; set; }
-        [Reference]
-        public SellerTable SellerTable { get; set; }
-        [ForeignKey(typeof(SellerTable), OnDelete = "CASCADE")]
-        public long SellerId { get; set; } // Provider
-        public decimal LocationLat { get; set; }
-        public decimal LocationLng { get; set; }
-    }
-
-    public class BookingPartnerTable
-    {
-        [PrimaryKey]
-        public string ClientId { get; set; }
-        public string Name { get; set; }
-        public string ClientSecret { get; set; }
-        public ClientModel ClientProperties { get; set; }
-        public bool Registered { get; set; }
-        public DateTime CreatedDate { get; set; }
-        public string InitialAccessToken { get; set; }
-        public DateTime InitialAccessTokenKeyValidUntil { get; set; }
-        public bool BookingsSuspended { get; set; }
-        public string Email { get; set; }
-    }
-
-    public class GrantTable
-    {
-        public string Key { get; set; }
-        public string Type { get; set; }
-        public string SubjectId { get; set; }
-        public string ClientId { get; set; }
-        public DateTime CreationTime { get; set; }
-        public DateTime? Expiration { get; set; }
-        public string Data { get; set; }
-    }
-
-    public class ClientModel
-    {
-        public string ClientUri { get; set; }
-
-        public string LogoUri { get; set; }
-
-        public string[] GrantTypes { get; set; }
-
-        public string[] RedirectUris { get; set; }
-
-        public string Scope { get; set; }
-    }
-
-    public static class DatabaseCreator
-    {
-        public static void CreateTables(OrmLiteConnectionFactory dbFactory)
-        {
-            using (var db = dbFactory.Open())
-            {
-                db.DropTable<SellerUserTable>();
-                db.DropTable<OrderItemsTable>();
-                db.DropTable<OccurrenceTable>();
-                db.DropTable<OrderTable>();
-                db.DropTable<ClassTable>();
-                db.DropTable<SellerTable>();
-                db.DropTable<FacilityUseTable>();
-                db.DropTable<SlotTable>();
-                db.DropTable<GrantTable>();
-                db.DropTable<BookingPartnerTable>();
-                db.CreateTable<GrantTable>();
-                db.CreateTable<BookingPartnerTable>();
-                db.CreateTable<SellerTable>();
-                db.CreateTable<ClassTable>();
-                db.CreateTable<OrderTable>();
-                db.CreateTable<OccurrenceTable>();
-                db.CreateTable<OrderItemsTable>();
-                db.CreateTable<FacilityUseTable>();
-                db.CreateTable<SlotTable>();
-                db.CreateTable<SellerUserTable>();
-            }
-        }
-    }
-}
diff --git a/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs b/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs
index fbe8da2f..f02925ee 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
-            Database.GetBookingPartners();
+#pragma warning disable 4014
+            BookingPartnerTable.Get().Wait();
+#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())
@@ -167,40 +175,41 @@ static FakeDatabase()
             Randomizer.Seed = new Random((int)(DateTime.Today - new DateTime(1970, 1, 1)).TotalDays);
         }
 
-        private const int OpportunityCount = 2000;
+        private static readonly int OpportunityCount =
+            int.TryParse(Environment.GetEnvironmentVariable("OPPORTUNITY_COUNT"), out var opportunityCount) ? opportunityCount : 2000;
 
         /// <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 +224,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 +255,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 +280,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 +303,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 +329,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 +354,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 +377,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 +433,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 +464,79 @@ 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 async Task DeleteBookingPartner(string clientId)
+        {
+            using (var db = await Mem.Database.OpenAsync())
+            {
+                await db.DeleteAsync<BookingPartnerTable>(x => x.ClientId == clientId);
             }
         }
 
-        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 +545,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 +578,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 +649,8 @@ public static bool AddOrder(
                      }
                      : null;
 
-                hasFoundOccurrence = true;
                 return (
-                    hasFoundOccurrence,
+                    true,
                     thisClass,
                     occurrence,
                     bookedOrderItemInfo
@@ -669,21 +658,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 +681,8 @@ public static bool AddOrder(
                      }
                      : null;
 
-                hasFoundOccurrence = true;
                 return (
-                    hasFoundOccurrence,
+                    true,
                     facilityUse,
                     slot,
                     bookedOrderItemInfo
@@ -704,12 +690,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 +711,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 +741,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 +755,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 +766,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 +787,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 +801,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 +812,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 +829,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 +842,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 +856,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 +884,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 +897,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 +915,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 +929,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 +955,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 +966,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 +1039,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 +1053,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 +1080,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 +1092,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 +1142,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 +1171,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 +1193,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 +1223,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 +1239,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 +1264,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 +1276,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 +1293,96 @@ 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 CreateOrders(db); // Add these in to generate your own orders and grants, otherwise generate them using the test suite
+                await CreateGrants(db);
+                await BookingPartnerTable.Create(db);
                 transaction.Commit();
             }
+
             return database;
         }
 
-        private static void CreateFakeFacilitiesAndSlots(IDbConnection db)
+        private static async Task CreateFakeFacilitiesAndSlots(IDbConnection db)
         {
             var opportunitySeeds = GenerateOpportunitySeedDistribution(OpportunityCount);
 
@@ -1415,9 +1394,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 +1405,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 +1425,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 +1433,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 +1449,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 +1465,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 +1473,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 +1494,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,270 +1509,209 @@ 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);
-        }
-
-        public static void CreateSellerUsers(IDbConnection db)
-        {
-            var sellerUsers = new List<SellerUserTable>
-            {
-                new SellerUserTable { Id = 100, Username = "test1", PasswordHash = "test1".Sha256(), SellerId = 1 },
-                new SellerUserTable { Id = 101, Username = "test1b", PasswordHash = "test1b".Sha256(), SellerId = 1 },
-                new SellerUserTable { Id = 102, Username = "test2", PasswordHash = "test2".Sha256(), SellerId = 2 },
-                new SellerUserTable { Id = 103, Username = "test3", PasswordHash = "test3".Sha256(), SellerId = 3 },
-                new SellerUserTable { Id = 104, Username = "test4", PasswordHash = "test4".Sha256(), SellerId = 4 },
-                new SellerUserTable { Id = 105, Username = "test5", PasswordHash = "test5".Sha256(), SellerId = 5 },
-            };
-
-            db.InsertAll(sellerUsers);
+            await db.InsertAllAsync(sellers);
         }
 
-        public bool ValidateSellerUserCredentials(string Username, string Password)
+        public static async Task CreateOrders(IDbConnection db)
         {
-            using (var db = Mem.Database.Open())
+            var orders = new List<OrderTable>
             {
-                var matchingUser = db.Single<SellerUserTable>(x => x.Username == Username && x.PasswordHash == Password.Sha256());
-                return (matchingUser != null);
-            }
-        }
-
-        public SellerUserTable GetSellerUser(string Username)
-        {
-            using (var db = Mem.Database.Open())
-            {
-                return db.Single<SellerUserTable>(x => x.Username == Username);
-            }
-        }
-
-        public SellerUserTable GetSellerUserById(long sellerUserId)
-        {
-            using (var db = Mem.Database.Open())
-            {
-                return db.LoadSingleById<SellerUserTable>(sellerUserId);
-            }
-        }
-
-        /*
-        public List<BookingPartnerAdministratorTable> GetBookingPartnerAdministrators()
-        {
-            return new List<BookingPartnerAdministratorTable> {
-                new BookingPartnerAdministratorTable
+                new OrderTable
                 {
-                    Username = "test",
-                    Password = "test".Sha256(),
-                    SubjectId = "TestSubjectId",
-                    Claims = new List<Claim>
-                    {
-                        new Claim("https://openactive.io/sellerName", "Example Seller"),
-                        new Claim("https://openactive.io/sellerId", "https://localhost:5001/api/identifiers/sellers/1"),
-                        new Claim("https://openactive.io/sellerUrl", "http://abc.com"),
-                        new Claim("https://openactive.io/sellerLogo", "http://abc.com/logo.jpg"),
-                        new Claim("https://openactive.io/bookingServiceName", "Example Sellers Booking Service"),
-                        new Claim("https://openactive.io/bookingServiceUrl", "http://abc.com/booking-service")
-                    }
-                }
-            };
-        }
-        */
-
-
-        public static void CreateBookingPartners(IDbConnection db)
-        {
-            var bookingPartners = new List<BookingPartnerTable>
-            {
-                new BookingPartnerTable { Name = "Test Suite 1", ClientId = Guid.NewGuid().ToString(), InitialAccessToken = "openactive_test_suite_client_12345xaq", Registered = false, InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now },
-                new BookingPartnerTable { Name = "Acmefitness", ClientId = "clientid_800", ClientSecret = "secret".Sha256(), Email="garden@health.com", Registered = true, InitialAccessToken = "98767", InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now, BookingsSuspended = false,
-                    ClientProperties = new ClientModel {
-                        Scope = "openid profile openactive-openbooking openactive-ordersfeed openactive-identity",
-                        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" }
-                    }
-                },
-                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,
-                    ClientProperties = new ClientModel {
-                        Scope = "openid profile openactive-openbooking openactive-ordersfeed openactive-identity",
-                        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" }
-                    }
-                },
-                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}"
+                    OrderId = Guid.NewGuid().ToString(),
+                    Deleted = false,
+                    OrderCreated = DateTimeOffset.Now,
+                    OrderModified = DateTimeOffset.Now.Ticks,
+                    OrderProposalModified = DateTimeOffset.Now.Ticks,
+                    ClientId = "clientid_XXX",
+                    SellerId = 1,
+                    CustomerType = CustomerType.Person,
+                    BrokerRole = BrokerRole.AgentBroker,
+                    BrokerName = "Adult Fitness Challenge",
+                    BrokerUrl = new Uri("https://myfitnessapp.example.com/"),
+                    CustomerEmail = "Ardith72@hotmail.com",
+                    CustomerIdentifier = Guid.NewGuid().ToString(),
+                    CustomerGivenName = "Hills",
+                    CustomerFamilyName = "Modesta",
+                    CustomerTelephone = "731.403.0727",
+                    PaymentIdentifier = "dyulZE-Kt",
+                    PaymentName = "AcmeBroker Points",
+                    PaymentProviderId = "STRIPE",
+                    PaymentAccountId = "SN1593",
+                    TotalOrderPrice = 14.99M,
+                    OrderMode = OrderMode.Booking,
+                    LeaseExpires = DateTime.Now.AddDays(10),
+                    VisibleInOrdersFeed = FeedVisibility.None
                 },
-                new GrantTable()
+                new OrderTable
                 {
-                    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}"
+                    OrderId = Guid.NewGuid().ToString(),
+                    Deleted = false,
+                    OrderCreated = DateTimeOffset.Now,
+                    OrderModified = DateTimeOffset.Now.Ticks,
+                    OrderProposalModified = DateTimeOffset.Now.Ticks,
+                    ClientId = "clientid_YYY",
+                    SellerId = 1,
+                    CustomerType = CustomerType.Person,
+                    BrokerRole = BrokerRole.AgentBroker,
+                    BrokerName = "Healthy Steps App",
+                    BrokerUrl = new Uri("https://myfitnessapp.example.com/"),
+                    CustomerEmail = "Zelma.Pacocha79@gmail.com",
+                    CustomerIdentifier = Guid.NewGuid().ToString(),
+                    CustomerGivenName = "Boyer",
+                    CustomerFamilyName = "Santos",
+                    CustomerTelephone = "1-346-608-5991 x53561",
+                    PaymentIdentifier = "JU1ktRR7U",
+                    PaymentName = "AcmeBroker Points",
+                    PaymentProviderId = "STRIPE",
+                    PaymentAccountId = "SN1593",
+                    TotalOrderPrice = 14.99M,
+                    OrderMode = OrderMode.Booking,
+                    LeaseExpires = DateTime.Now.AddDays(10),
+                    VisibleInOrdersFeed = FeedVisibility.None
                 },
-                new GrantTable()
+                new OrderTable
                 {
-                    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}"
-                },
+                    OrderId = Guid.NewGuid().ToString(),
+                    Deleted = false,
+                    OrderCreated = DateTimeOffset.Now,
+                    OrderModified = DateTimeOffset.Now.Ticks,
+                    OrderProposalModified = DateTimeOffset.Now.Ticks,
+                    ClientId = "clientid_YYY",
+                    SellerId = 1,
+                    CustomerType = CustomerType.Person,
+                    BrokerRole = BrokerRole.AgentBroker,
+                    BrokerName = "Healthy Steps Website",
+                    BrokerUrl = new Uri("https://myfitnessapp.example.com/"),
+                    CustomerEmail = "Regan_Moen4@gmail.com",
+                    CustomerIdentifier = Guid.NewGuid().ToString(),
+                    CustomerGivenName = "Kohler",
+                    CustomerFamilyName = "Toby",
+                    CustomerTelephone = "1-585-849-0456",
+                    PaymentIdentifier = "Lr4GW6MNQ",
+                    PaymentName = "AcmeBroker Points",
+                    PaymentProviderId = "STRIPE",
+                    PaymentAccountId = "SN1593",
+                    TotalOrderPrice = 59.96M,
+                    OrderMode = OrderMode.Booking,
+                    LeaseExpires = DateTime.Now.AddDays(10),
+                    VisibleInOrdersFeed = FeedVisibility.None
+                }
             };
 
-            db.InsertAll(bookingPartners);
-            //db.InsertAll(grants);
+            await db.InsertAllAsync(orders);
         }
 
-        public List<BookingPartnerTable> GetBookingPartners()
+        public static async Task CreateGrants(IDbConnection db)
         {
-            using (var db = Mem.Database.Open())
+            var grants = new List<GrantTable>
             {
-                return db.Select<BookingPartnerTable>().ToList();
-            }
-        }
+                new GrantTable { ClientId = "clientid_XXX", SubjectId = "100", Type = "user_consent" },
+                new GrantTable { ClientId = "clientid_YYY", SubjectId = "100", Type = "user_consent" },
+                new GrantTable { ClientId = "clientid_ZZZ", SubjectId = "100", Type = "user_consent" },
+            };
 
-        public BookingPartnerTable GetBookingPartnerByInitialAccessToken(string registrationKey)
-        {
-            using (var db = Mem.Database.Open())
-            {
-                var bookingPartner = db.Single<BookingPartnerTable>(x => x.InitialAccessToken == registrationKey);
-                return bookingPartner?.InitialAccessTokenKeyValidUntil > DateTime.Now ? bookingPartner : null;
-            }
+            await db.InsertAllAsync(grants);
         }
 
-        public BookingPartnerTable GetBookingPartner(string clientId)
+        public static readonly SellerUserTable[] DefaultSellerUsers =
         {
-            using (var db = Mem.Database.Open())
-            {
-                return db.Single<BookingPartnerTable>(x => x.ClientId == clientId);
-            }
-        }
-
-        public void SaveBookingPartner(BookingPartnerTable bookingPartnerTable)
-        {
-            using (var db = Mem.Database.Open())
-            {
-                db.Save(bookingPartnerTable);
-            }
-        }
+            new SellerUserTable {Id = 100, Username = "test1", PasswordRaw = "test1", SellerId = 1},
+            new SellerUserTable {Id = 101, Username = "test1b", PasswordRaw = "test1b", SellerId = 1},
+            new SellerUserTable {Id = 102, Username = "test2", PasswordRaw = "test2", SellerId = 2},
+            new SellerUserTable {Id = 103, Username = "test3", PasswordRaw = "test3", SellerId = 3},
+            new SellerUserTable {Id = 104, Username = "test4", PasswordRaw = "test4", SellerId = 4},
+            new SellerUserTable {Id = 105, Username = "test5", PasswordRaw = "test5", SellerId = 5},
+        };
 
-        public void ResetBookingPartnerKey(string clientId, string key)
+        public static async Task CreateSellerUsers(IDbConnection db)
         {
-            using (var db = Mem.Database.Open())
-            {
-                var bookingPartner = db.Single<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.InsertAllAsync(DefaultSellerUsers);
         }
 
-        public void SetBookingPartnerKey(string clientId, string key)
+        public async Task<bool> ValidateSellerUserCredentials(string username, string password)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var bookingPartner = db.Single<BookingPartnerTable>(x => x.ClientId == clientId);
-                bookingPartner.InitialAccessToken = key;
-                bookingPartner.InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(2);
-                db.Save(bookingPartner);
+                var matchingUser = await db.SingleAsync<SellerUserTable>(x => x.Username == username && x.PasswordHash == password.Sha256());
+                return matchingUser != null;
             }
         }
 
-        public void UpdateBookingPartnerScope(string clientId, string scope, bool bookingsSuspended)
+        public async Task<SellerUserTable> GetSellerUser(string username)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                var bookingPartner = db.Single<BookingPartnerTable>(x => x.ClientId == clientId);
-                bookingPartner.ClientProperties.Scope = scope;
-                bookingPartner.BookingsSuspended = true;
-                db.Save(bookingPartner);
+                return await db.SingleAsync<SellerUserTable>(x => x.Username == username);
             }
         }
 
-
-        public void AddBookingPartner(BookingPartnerTable newBookingPartner)
+        public async Task<SellerUserTable> GetSellerUserById(long sellerUserId)
         {
-            using (var db = Mem.Database.Open())
+            using (var db = await Mem.Database.OpenAsync())
             {
-                db.Save(newBookingPartner);
+                return await db.LoadSingleByIdAsync<SellerUserTable>(sellerUserId);
             }
         }
 
-        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 +1734,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 +1762,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 +1775,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 +1783,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 +1804,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 +1817,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 +1844,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 +1852,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 +1906,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 +1916,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 +1925,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 +1953,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/Fakes/OpenActive.FakeDatabase.NET/Models/BookingPartnerTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/BookingPartnerTable.cs
new file mode 100644
index 00000000..bc4b18ef
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/BookingPartnerTable.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using ServiceStack.DataAnnotations;
+using ServiceStack.OrmLite;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class BookingPartnerTable
+    {
+        [PrimaryKey]
+        public string ClientId { get; set; }
+        public string Name { get; set; }
+        public string ClientSecret { get; set; }
+        public string ClientUri { get; set; }
+        public string RestoreAccessUri { get; set; }
+        public string LogoUri { get; set; }
+        public string[] GrantTypes { get; set; }
+        public string[] RedirectUris { get; set; }
+        public string Scope { get; set; }
+        public bool Registered { get; set; }
+        public DateTime CreatedDate { get; set; }
+        public string InitialAccessToken { get; set; }
+        public DateTime InitialAccessTokenKeyValidUntil { get; set; }
+        public bool BookingsSuspended { get; set; }
+        public string Email { get; set; }
+
+        public static async Task Create(IDbConnection db)
+        {
+            var bookingPartners = new List<BookingPartnerTable>
+            {
+                new BookingPartnerTable { Name = "RED January", ClientId = Guid.NewGuid().ToString(), InitialAccessToken = "openactive_test_suite_client_12345xaq", Registered = false, InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now },
+                new BookingPartnerTable { Name = "Acmefitness", ClientId = "clientid_800", ClientSecret = "secret".Sha256(), Email="garden@health.com", Registered = true, InitialAccessToken = "98767", InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now, BookingsSuspended = false,
+                    Scope = "openid profile openactive-openbooking openactive-ordersfeed openactive-identity",
+                    GrantTypes = new[] { "client_credentials", "refresh_token", "authorization_code" },
+                    ClientUri = "http://example.com",
+                    RestoreAccessUri = "http://example.com",
+                    LogoUri = "https://via.placeholder.com/512x256.png?text=Logo",
+                    RedirectUris = new[] { "http://localhost:3000/cb" }
+                },
+                new BookingPartnerTable { Name = "Mum's runs", ClientId = "clientid_801", ClientSecret = "secret".Sha256(), Email="garden@health.com", Registered = true, InitialAccessToken = "98768", InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now, BookingsSuspended = false,
+                    Scope = "openid profile openactive-openbooking openactive-ordersfeed openactive-identity",
+                    GrantTypes = new[] { "client_credentials", "refresh_token", "authorization_code" },
+                    ClientUri = "http://example.com",
+                    RestoreAccessUri = "http://example.com",
+                    LogoUri = "https://via.placeholder.com/512x256.png?text=Logo",
+                    RedirectUris = new[] { "http://localhost:3000/cb" }
+                },
+                new BookingPartnerTable { Name = "Vivacity Insurance", ClientId = Guid.NewGuid().ToString(), InitialAccessToken = "dynamic-primary-745ddf2d13019ce8b69c", Registered = false, InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now },
+                new BookingPartnerTable { Name = "Active with Friends", ClientId = Guid.NewGuid().ToString(), InitialAccessToken = "dynamic-secondary-a21518cb57af7b6052df", Registered = false, InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now },
+                new BookingPartnerTable { Name = "Ultimate Fitness Challenge", ClientId = "clientid_XXX", ClientSecret = "secret".Sha256(), Email="garden@health.com", Registered = true, InitialAccessToken = "123123", InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now, BookingsSuspended = false,
+                    Scope = "openid profile openactive-openbooking openactive-ordersfeed openactive-identity",
+                    GrantTypes = new[] { "client_credentials", "refresh_token", "authorization_code" },
+                    ClientUri = "http://example.com",
+                    RestoreAccessUri = "http://example.com",
+                    LogoUri = "https://via.placeholder.com/512x256.png?text=Logo",
+                    RedirectUris = new[] { "http://localhost:3000/cb" }
+                },
+                new BookingPartnerTable { Name = "Healthy Steps Every Day", ClientId = "clientid_YYY", ClientSecret = "secret".Sha256(), Email="garden@health.com", Registered = true, InitialAccessToken = "456456", InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(1), CreatedDate = DateTime.Now, BookingsSuspended = false,
+                    Scope = "openid profile openactive-openbooking openactive-ordersfeed openactive-identity",
+                    GrantTypes = new[] { "client_credentials", "refresh_token", "authorization_code" },
+                    ClientUri = "http://example.com",
+                    RestoreAccessUri = "http://example.com",
+                    LogoUri = "https://via.placeholder.com/512x256.png?text=Logo",
+                    RedirectUris = new[] { "http://localhost:3000/cb" }
+                },
+            };
+
+            await db.InsertAllAsync(bookingPartners);
+            // To populate GrantTable locally, run the tests, e.g. `NODE_APP_INSTANCE=dev npm run start auth non-free`
+        }
+
+        public static async Task<List<BookingPartnerTable>> Get()
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                return await db.SelectAsync<BookingPartnerTable>();
+            }
+        }
+
+        public static async Task<List<BookingPartnerTable>> GetBySellerUserId(long sellerUserId)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                var query = db.From<BookingPartnerTable>()
+                              .Join<BookingPartnerTable, GrantTable>((b, g) => b.ClientId == g.ClientId && g.Type == "user_consent")
+                              .Join<GrantTable, SellerUserTable>((g, s) => g.SubjectId == s.Id.ToString())
+                              .Where<SellerUserTable>(s => s.Id == sellerUserId);
+                return await db.SelectAsync(query);
+            }
+        }
+
+        public static async Task<BookingPartnerTable> GetByInitialAccessToken(string registrationKey)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.InitialAccessToken == registrationKey);
+                return bookingPartner?.InitialAccessTokenKeyValidUntil > DateTime.Now ? bookingPartner : null;
+            }
+        }
+
+        public static async Task<BookingPartnerTable> GetByClientId(string clientId)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                return await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
+            }
+        }
+
+        public static async Task Save(BookingPartnerTable bookingPartnerTable)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                await db.SaveAsync(bookingPartnerTable);
+            }
+        }
+
+        public static async Task ResetKey(string clientId, string key)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                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;
+                await db.SaveAsync(bookingPartner);
+            }
+        }
+
+        public static async Task SetKey(string clientId, string key)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
+                bookingPartner.InitialAccessToken = key;
+                bookingPartner.InitialAccessTokenKeyValidUntil = DateTime.Now.AddDays(2);
+                await db.SaveAsync(bookingPartner);
+            }
+        }
+
+        public static async Task UpdateScope(string clientId, string scope, bool bookingsSuspended)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
+                bookingPartner.Scope = scope;
+                bookingPartner.BookingsSuspended = true;
+                await db.SaveAsync(bookingPartner);
+            }
+        }
+
+        public static async Task Add(BookingPartnerTable newBookingPartner)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                await db.SaveAsync(newBookingPartner);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/BookingStatistics.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/BookingStatistics.cs
new file mode 100644
index 00000000..af61cb1a
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/BookingStatistics.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ServiceStack.OrmLite;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class BookingStatistics
+    {
+        public string ClientId { get; set; }
+        public Dictionary<string, int> BookingsByBroker { get; set; }
+        public int SellersEnabled { get; set; }
+
+        // ToDo: this is N+1 - if we nuke the ORM, we can re-write the main query to avoid this
+        public static async Task<BookingStatistics> Get(string clientId)
+        {
+            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            {
+                var thirtyDaysAgo = DateTimeOffset.Now.AddDays(-30);
+                var bookingsByBroker = (await db.SelectAsync<OrderTable>(o => o.ClientId == clientId && o.OrderCreated > thirtyDaysAgo))
+                                                .GroupBy(o => o.BrokerName)
+                                                .ToDictionary(g => g.Key, g => g.Count());
+                var sellersQuery = db.From<BookingPartnerTable>()
+                                     .Join<BookingPartnerTable, GrantTable>((b, g) => b.ClientId == g.ClientId)
+                                     .Join<GrantTable, SellerUserTable>((g, s) => g.SubjectId == s.Id.ToString())
+                                     .Where<BookingPartnerTable>(b => b.ClientId == clientId);
+                var sellersEnabled = await db.SelectAsync<SellerUserTable>(sellersQuery); // ToDo: this is only used in one of the cases - should we split this into two classes?
+                return new BookingStatistics { ClientId = clientId, BookingsByBroker = bookingsByBroker, SellersEnabled = sellersEnabled.Count };
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/ClassTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/ClassTable.cs
new file mode 100644
index 00000000..daac55f9
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/ClassTable.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using ServiceStack.DataAnnotations;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class ClassTable : Table
+    {
+        public string TestDatasetIdentifier { get; set; }
+        public string Title { get; set; }
+        [Reference]
+        public SellerTable SellerTable { get; set; }
+        [ForeignKey(typeof(SellerTable), OnDelete = "CASCADE")]
+        public long SellerId { get; set; }
+        public decimal? Price { get; set; }
+        public RequiredStatusType? Prepayment { get; set; }
+        public bool RequiresAttendeeValidation { get; set; }
+        public bool RequiresAdditionalDetails { get; set; }
+        public List<AdditionalDetailTypes> RequiredAdditionalDetails { get; set; }
+        public bool AllowCustomerCancellationFullRefund { get; set; }
+        public bool RequiresApproval { get; set; }
+        public TimeSpan? ValidFromBeforeStartDate { get; set; }
+        public TimeSpan? LatestCancellationBeforeStartDate { get; set; }
+        public decimal LocationLat { get; set; }
+        public decimal LocationLng { get; set; }
+        public AttendanceMode AttendanceMode { get; set; }
+        public bool AllowsProposalAmendment { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/DatabaseTables.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/DatabaseTables.cs
new file mode 100644
index 00000000..20630ff9
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/DatabaseTables.cs
@@ -0,0 +1,62 @@
+using System;
+using ServiceStack.DataAnnotations;
+using ServiceStack.OrmLite;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public enum BrokerRole { AgentBroker, ResellerBroker, NoBroker }
+
+    public enum BookingStatus { None, CustomerCancelled, SellerCancelled, Confirmed, Attended, Absent }
+
+    public enum ProposalStatus { AwaitingSellerConfirmation, SellerAccepted, SellerRejected, CustomerRejected }
+
+    public enum FeedVisibility { None, Visible, Archived }
+
+    public enum OrderMode { Lease, Proposal, Booking }
+
+    public enum RequiredStatusType { Required, Optional, Unavailable }
+
+    public enum AttendanceMode { Offline, Online, Mixed }
+
+    public enum AdditionalDetailTypes { Age, PhotoConsent, Experience, Gender, FileUpload }
+
+    [CompositeIndex(nameof(Modified), nameof(Id))]
+    public abstract class Table
+    {
+        [PrimaryKey]
+        [AutoIncrement]
+        public long Id { get; set; }
+        public bool Deleted { get; set; }
+        public long Modified { get; set; } = new DateTimeOffset(DateTime.Today).UtcTicks;
+    }
+
+    public static class DatabaseCreator
+    {
+        public static void CreateTables(OrmLiteConnectionFactory dbFactory)
+        {
+            using (var db = dbFactory.Open())
+            {
+                db.DropTable<SellerUserTable>();
+                db.DropTable<OrderItemsTable>();
+                db.DropTable<OccurrenceTable>();
+                db.DropTable<OrderTable>();
+                db.DropTable<ClassTable>();
+                db.DropTable<SellerTable>();
+                db.DropTable<FacilityUseTable>();
+                db.DropTable<SlotTable>();
+                db.DropTable<GrantTable>();
+                db.DropTable<BookingPartnerTable>();
+                db.CreateTable<GrantTable>();
+                db.CreateTable<BookingPartnerTable>();
+                db.CreateTable<SellerTable>();
+                db.CreateTable<ClassTable>();
+                db.CreateTable<OrderTable>();
+                db.CreateTable<OccurrenceTable>();
+                db.CreateTable<OrderItemsTable>();
+                db.CreateTable<FacilityUseTable>();
+                db.CreateTable<SlotTable>();
+                db.CreateTable<SellerUserTable>();
+            }
+        }
+    }
+}
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/FacilityUseTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/FacilityUseTable.cs
new file mode 100644
index 00000000..c875db32
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/FacilityUseTable.cs
@@ -0,0 +1,17 @@
+using ServiceStack.DataAnnotations;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class FacilityUseTable : Table
+    {
+        public string TestDatasetIdentifier { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        [Reference]
+        public SellerTable SellerTable { get; set; }
+        [ForeignKey(typeof(SellerTable), OnDelete = "CASCADE")]
+        public long SellerId { get; set; } // Provider
+        public decimal LocationLat { get; set; }
+        public decimal LocationLng { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/GrantTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/GrantTable.cs
new file mode 100644
index 00000000..cff858f5
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/GrantTable.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class GrantTable
+    {
+        public string Key { get; set; }
+        public string Type { get; set; }
+        public string SubjectId { get; set; }
+        public string ClientId { get; set; }
+        public DateTime CreationTime { get; set; }
+        public DateTime? Expiration { get; set; }
+        public string Data { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/OccurrenceTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/OccurrenceTable.cs
new file mode 100644
index 00000000..f06b6761
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/OccurrenceTable.cs
@@ -0,0 +1,19 @@
+using System;
+using ServiceStack.DataAnnotations;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class OccurrenceTable : Table
+    {
+        public string TestDatasetIdentifier { get; set; }
+        [Reference]
+        public ClassTable ClassTable { get; set; }
+        [ForeignKey(typeof(ClassTable), OnDelete = "CASCADE")]
+        public long ClassId { get; set; }
+        public DateTime Start { get; set; }
+        public DateTime End { get; set; }
+        public long TotalSpaces { get; set; }
+        public long LeasedSpaces { get; set; }
+        public long RemainingSpaces { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/OrderItemsTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/OrderItemsTable.cs
new file mode 100644
index 00000000..004c19f4
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/OrderItemsTable.cs
@@ -0,0 +1,34 @@
+using System;
+using ServiceStack.DataAnnotations;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class OrderItemsTable : Table
+    {
+        public string ClientId { get; internal set; }
+        public Uri OpportunityJsonLdId { get; set; }
+        public Uri OfferJsonLdId { get; set; }
+        [Reference]
+        public OrderTable OrderTable { get; set; }
+        [ForeignKey(typeof(OrderTable), OnDelete = "CASCADE")]
+        public string OrderId { get; set; }
+        [Reference]
+        public OccurrenceTable OccurrenceTable { get; set; }
+        [ForeignKey(typeof(OccurrenceTable), OnDelete = "CASCADE")]
+        public long? OccurrenceId { get; set; }
+        [Reference]
+        public SlotTable SlotTable { get; set; }
+        [ForeignKey(typeof(SlotTable), OnDelete = "CASCADE")]
+        public long? SlotId { get; set; }
+        public BookingStatus Status { get; set; }
+        public string CancellationMessage { get; set; }
+        public decimal Price { get; set; }
+        public string PinCode { get; set; }
+        public string ImageUrl { get; set; }
+        public string BarCodeText { get; set; }
+        public string CustomerNotice { get; set; }
+        public Uri MeetingUrl { get; set; }
+        public string MeetingId { get; set; }
+        public string MeetingPassword { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/OrderTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/OrderTable.cs
new file mode 100644
index 00000000..f83fd1a8
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/OrderTable.cs
@@ -0,0 +1,50 @@
+using System;
+using ServiceStack.DataAnnotations;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    [CompositeIndex(nameof(OrderModified), nameof(OrderId))]
+    [CompositeIndex(nameof(OrderProposalModified), nameof(OrderId))]
+    public class OrderTable
+    {
+        /**
+         * Note string type is used for the OrderId instead of Guid type to allow for correct ordering of GUIDs for the RPDE feed
+         */
+        [PrimaryKey]
+        public string OrderId { get; set; }
+
+        public bool Deleted { get; set; }
+        public DateTimeOffset OrderCreated { get; set; } = DateTimeOffset.Now;
+        public long OrderModified { get; set; } = DateTimeOffset.Now.UtcTicks;
+        public long OrderProposalModified { get; set; } = DateTimeOffset.Now.UtcTicks;
+        public string ClientId { get; set; }
+
+        [Reference]
+        public SellerTable SellerTable { get; set; }
+        [ForeignKey(typeof(SellerTable), OnDelete = "CASCADE")]
+        public long SellerId { get; set; }
+        public bool? CustomerIsOrganization { get; set; }
+        public CustomerType CustomerType { get; set; }
+        public BrokerRole BrokerRole { get; set; }
+        public string BrokerName { get; set; }
+        public Uri BrokerUrl { get; set; }
+        public string BrokerTelephone { get; set; }
+        public string CustomerEmail { get; set; }
+        public string CustomerIdentifier { get; set; }
+        public string CustomerGivenName { get; set; }
+        public string CustomerFamilyName { get; set; }
+        public string CustomerTelephone { get; set; }
+        public string CustomerOrganizationName { get; set; }
+        public string PaymentIdentifier { get; set; }
+        public string PaymentName { get; set; }
+        public string PaymentProviderId { get; set; }
+        public string PaymentAccountId { get; set; }
+        public decimal TotalOrderPrice { get; set; }
+        public OrderMode OrderMode { get; set; }
+        public DateTime LeaseExpires { get; set; }
+        public FeedVisibility VisibleInOrdersFeed { get; set; }
+        public FeedVisibility VisibleInOrderProposalsFeed { get; set; }
+        public ProposalStatus? ProposalStatus { get; set; }
+        public Guid? ProposalVersionId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/SellerTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/SellerTable.cs
new file mode 100644
index 00000000..14af6939
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/SellerTable.cs
@@ -0,0 +1,15 @@
+using ServiceStack.DataAnnotations;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class SellerTable
+    {
+        [PrimaryKey]
+        public long Id { get; set; }
+        public string Name { get; set; }
+        public bool IsIndividual { get; set; }
+        public string Url { get; set; }
+        public bool IsTaxGross { get; set; }
+        public string LogoUrl { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/SellerUserTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/SellerUserTable.cs
new file mode 100644
index 00000000..0eb75628
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/SellerUserTable.cs
@@ -0,0 +1,32 @@
+using ServiceStack.DataAnnotations;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class SellerUserTable
+    {
+        [PrimaryKey]
+        public long Id { get; set; }
+
+        public string Username { get; set; }
+
+        [Ignore]
+        public string PasswordRaw
+        {
+            get => _passwordRaw;
+            set
+            {
+                _passwordRaw = value;
+                PasswordHash = value.Sha256();
+            }
+        }
+        private string _passwordRaw;
+
+        public string PasswordHash { get; set; }
+
+        [Reference]
+        public SellerTable SellerTable { get; set; }
+
+        [ForeignKey(typeof(SellerTable), OnDelete = "CASCADE")]
+        public long SellerId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/SlotTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/SlotTable.cs
new file mode 100644
index 00000000..35fea58e
--- /dev/null
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/SlotTable.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using ServiceStack.DataAnnotations;
+
+namespace OpenActive.FakeDatabase.NET
+{
+    public class SlotTable : Table
+    {
+        public string TestDatasetIdentifier { get; set; }
+        [Reference]
+        public FacilityUseTable FacilityUseTable { get; set; }
+        [ForeignKey(typeof(FacilityUseTable), OnDelete = "CASCADE")]
+        public long FacilityUseId { get; set; }
+        public DateTime Start { get; set; }
+        public DateTime End { get; set; }
+        public long MaximumUses { get; set; }
+        public long LeasedUses { get; set; }
+        public long RemainingUses { get; set; }
+        public decimal? Price { get; set; }
+        public bool AllowCustomerCancellationFullRefund { get; set; }
+        public RequiredStatusType? Prepayment { get; set; }
+        public bool RequiresAttendeeValidation { get; set; }
+        public bool RequiresApproval { get; set; }
+        public bool RequiresAdditionalDetails { get; set; }
+        public List<AdditionalDetailTypes> RequiredAdditionalDetails { get; set; }
+        public TimeSpan? ValidFromBeforeStartDate { get; set; }
+        public TimeSpan? LatestCancellationBeforeStartDate { get; set; }
+        public bool AllowsProposalAmendment { get; set; }
+    }
+}
\ No newline at end of file
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