diff --git a/.github/workflows/openactive-test-suite.yml b/.github/workflows/openactive-test-suite.yml
index f72c6074..ad216f26 100644
--- a/.github/workflows/openactive-test-suite.yml
+++ b/.github/workflows/openactive-test-suite.yml
@@ -84,6 +84,8 @@ jobs:
         dotnet run --no-launch-profile --project ./server/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj --configuration Release --no-build &
       env:
         ASPNETCORE_ENVIRONMENT: ${{ matrix.profile }}
+        USE_REMOTE_STORAGE: false
+        DROP_TABLES_ON_RESTART: true
     - name: Install OpenActive Test Suite
       run: npm install
       working-directory: tests
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj b/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj
index fb12cf38..35b22b0c 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj
@@ -11,6 +11,9 @@
     <PackageReference Include="Serilog.AspNetCore" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.16" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.16" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.8" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/BookingPartners/BookingPartnersController.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/BookingPartners/BookingPartnersController.cs
index 21610d83..2de325c3 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/BookingPartners/BookingPartnersController.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/BookingPartners/BookingPartnersController.cs
@@ -109,7 +109,7 @@ public async Task<IActionResult> Remove([FromForm] string clientId)
         public async Task<IActionResult> Delete([FromForm] string clientId)
         {
             await _interaction.RevokeUserConsentAsync(clientId);
-            await FakeBookingSystem.Database.DeleteBookingPartner(clientId);
+            await FakeBookingSystem.FakeDatabase.DeleteBookingPartner(clientId);
             await _events.RaiseAsync(new GrantsRevokedEvent(User.GetSubjectId(), clientId));
 
             return Redirect("/booking-partners/sys-admin");
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
index 4ec608f4..46d11464 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Grants/PersistedGrantStore.cs
@@ -22,7 +22,7 @@ public async Task<IEnumerable<PersistedGrant>> GetAllAsync(PersistedGrantFilter
         {
             filter.Validate();
 
-            var grants = await FakeBookingSystem.Database.GetAllGrants(filter.SubjectId, filter.SessionId, filter.ClientId, filter.Type);
+            var grants = await FakeBookingSystem.FakeDatabase.GetAllGrants(filter.SubjectId, filter.SessionId, filter.ClientId, filter.Type);
 
             _logger.LogDebug("{persistedGrantCount} persisted grants found for {@filter}", grants.Count, filter);
 
@@ -44,7 +44,7 @@ public async Task<IEnumerable<PersistedGrant>> GetAllAsync(PersistedGrantFilter
 
         public async Task<PersistedGrant> GetAsync(string key)
         {
-            var grant = await FakeBookingSystem.Database.GetGrant(key);
+            var grant = await FakeBookingSystem.FakeDatabase.GetGrant(key);
 
             _logger.LogDebug("{persistedGrantKey} found in database: {persistedGrantKeyFound}", key, grant != null);
 
@@ -68,19 +68,19 @@ public async Task RemoveAllAsync(PersistedGrantFilter filter)
 
             _logger.LogDebug("removing all persisted grants from database for {@filter}", filter);
 
-            await FakeBookingSystem.Database.RemoveAllGrants(filter.SubjectId, filter.SessionId, filter.ClientId, filter.Type);
+            await FakeBookingSystem.FakeDatabase.RemoveAllGrants(filter.SubjectId, filter.SessionId, filter.ClientId, filter.Type);
         }
 
         public async Task RemoveAsync(string key)
         {
             _logger.LogDebug("removing {persistedGrantKey} persisted grant from database", key);
 
-            await FakeBookingSystem.Database.RemoveGrant(key);
+            await FakeBookingSystem.FakeDatabase.RemoveGrant(key);
         }
         
         public async Task StoreAsync(PersistedGrant grant)
         {
-            if (await FakeBookingSystem.Database.AddGrant(grant.Key, grant.Type, grant.SubjectId, grant.SessionId, grant.ClientId, grant.CreationTime, grant.ConsumedTime, grant.Expiration, grant.Data))
+            if (await FakeBookingSystem.FakeDatabase.AddGrant(grant.Key, grant.Type, grant.SubjectId, grant.SessionId, grant.ClientId, grant.CreationTime, grant.ConsumedTime, grant.Expiration, grant.Data))
             {
                 _logger.LogDebug("{persistedGrantKey} not found in database, and so was inserted", grant.Key);
             }
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
index 2009a221..c0ff7581 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/Custom/Users/UserRepository.cs
@@ -16,19 +16,19 @@ public UserRepository(string jsonLdIdBaseUrl)
 
         public Task<bool> ValidateCredentials(string username, string password)
         {
-            return FakeBookingSystem.Database.ValidateSellerUserCredentials(username, password);
+            return FakeBookingSystem.FakeDatabase.ValidateSellerUserCredentials(username, password);
         }
 
         public async Task<UserWithClaims> FindBySubjectId(string subjectId)
         {
             return long.TryParse(subjectId, out var longSubjectId)
-                ? GetUserFromSellerUserWithClaims(await FakeBookingSystem.Database.GetSellerUserById(longSubjectId))
+                ? GetUserFromSellerUserWithClaims(await FakeBookingSystem.FakeDatabase.GetSellerUserById(longSubjectId))
                 : null;
         }
 
         public async Task<User> FindByUsername(string username)
         {
-            return GetUserFromSellerUser(await FakeBookingSystem.Database.GetSellerUser(username));
+            return GetUserFromSellerUser(await FakeBookingSystem.FakeDatabase.GetSellerUser(username));
         }
 
         // TODO: Make this an extension method
diff --git a/Examples/BookingSystem.AspNetCore/BackgroundServices/FakeDataRefresherService.cs b/Examples/BookingSystem.AspNetCore/BackgroundServices/FakeDataRefresherService.cs
new file mode 100644
index 00000000..1a75a2d0
--- /dev/null
+++ b/Examples/BookingSystem.AspNetCore/BackgroundServices/FakeDataRefresherService.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using OpenActive.FakeDatabase.NET;
+
+
+namespace BookingSystem
+{
+    // Background task
+    // More information: https://docs.microsoft.com/en-us/dotnet/architecture/microservices/multi-container-microservice-net-applications/background-tasks-with-ihostedservice#implementing-ihostedservice-with-a-custom-hosted-service-class-deriving-from-the-backgroundservice-base-class
+    public class FakeDataRefresherService : BackgroundService
+    {
+        private readonly ILogger<FakeDataRefresherService> _logger;
+        private readonly AppSettings _settings;
+
+        public FakeDataRefresherService(AppSettings settings, ILogger<FakeDataRefresherService> logger)
+        {
+            _settings = settings;
+            _logger = logger;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            _logger.LogDebug($"FakeDataRefresherService is starting..");
+
+            stoppingToken.Register(() =>
+                _logger.LogDebug($"FakeDataRefresherService background task is stopping."));
+
+            while (!stoppingToken.IsCancellationRequested)
+            {
+                await FakeBookingSystem.FakeDatabase.HardDeletedOldSoftDeletedOccurrencesAndSlots();
+                _logger.LogDebug($"FakeDataRefresherService hard deleted opportunities that were previously old and soft deleted");
+
+                await FakeBookingSystem.FakeDatabase.SoftDeletedPastOpportunitiesAndInsertNewAtEdgeOfWindow();
+                _logger.LogDebug($"FakeDataRefresherService soft deleted opportunities and inserted new ones at edge of window.");
+
+                _logger.LogDebug($"FakeDataRefresherService is finished");
+                await Task.Delay(_settings.DataRefresherInterval, stoppingToken);
+            }
+        }
+    }
+}
diff --git a/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj b/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj
index e02b4905..af70eefe 100644
--- a/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj
+++ b/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj
@@ -3,9 +3,21 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>aspnet-BookingSystem.AspNetCore-443B4F82-A20C-41CE-9924-329A0BCF0D14</UserSecretsId>
+    <!-- <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
+    <AspNetCoreModuleName>AspNetCoreModule</AspNetCoreModuleName> -->
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.App">
+      <PrivateAssets Condition="'%(PackageReference.Version)' == ''">all</PrivateAssets>
+      <Publish Condition="'%(PackageReference.Version)' == ''">true</Publish>
+    </PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
+    <PackageReference Include="OpenActive.NET" Version="15.2.21" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.16" />
+    <PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.16" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
   </ItemGroup>
 
@@ -16,6 +28,7 @@
 
   <ItemGroup>
     <Folder Include="Authentication\" />
+    <Folder Include="BackgroundServices\" />
   </ItemGroup>
   <PropertyGroup>
     <NoWarn>1701;1702;1591</NoWarn>
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs
index caa10fbb..8a0ead09 100644
--- a/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs
+++ b/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs
@@ -24,7 +24,10 @@ public AcmeFacilityUseRpdeGenerator(AppSettings appSettings)
 
         protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";
+            var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";
+
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var q = db.From<FacilityUseTable>()
                 .Join<SellerTable>()
@@ -107,8 +110,8 @@ protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? af
                             FacilityType = new List<Concept> {
                                 new Concept
                                 {
-                                    Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),
-                                    PrefLabel = "Squash Court",
+                                    Id = new Uri(facilityTypeId),
+                                    PrefLabel = facilityTypePrefLabel,
                                     InScheme = new Uri("https://openactive.io/facility-types")
                                 }
                             }
@@ -133,7 +136,7 @@ public AcmeFacilityUseSlotRpdeGenerator(AppSettings appSettings)
 
         protected override async Task<List<RpdeItem<Slot>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var query = db.Select<SlotTable>()
                 .OrderBy(x => x.Modified)
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/OrdersFeed.cs b/Examples/BookingSystem.AspNetCore/Feeds/OrdersFeed.cs
index 6fe7d2e2..53784c9e 100644
--- a/Examples/BookingSystem.AspNetCore/Feeds/OrdersFeed.cs
+++ b/Examples/BookingSystem.AspNetCore/Feeds/OrdersFeed.cs
@@ -27,7 +27,7 @@ protected override async Task<List<RpdeItem>> GetRPDEItems(string clientId, long
             // and update this class to inherit from OrdersRPDEFeedIncrementingUniqueChangeNumber
             // (to use afterChangeNumber, instead of afterTimestamp and afterId)
 
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 long afterTimestampLong = afterTimestamp ?? 0;
                 var q = db.From<OrderTable>()
@@ -126,7 +126,7 @@ public AcmeOrderProposalsFeedRpdeGenerator(AppSettings appSettings)
 
         protected override async Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 long afterTimestampLong = afterTimestamp ?? 0;
                 var q = db.From<OrderTable>()
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs
index 5d0e2c1b..8ea2243f 100644
--- a/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs
+++ b/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs
@@ -17,7 +17,7 @@ public class AcmeScheduledSessionRpdeGenerator : RpdeFeedModifiedTimestampAndIdL
 
         protected override async Task<List<RpdeItem<ScheduledSession>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var query = db.Select<OccurrenceTable>()
                 .OrderBy(x => x.Modified)
@@ -74,7 +74,10 @@ public AcmeSessionSeriesRpdeGenerator(AppSettings appSettings)
 
         protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            var activityId = Environment.GetEnvironmentVariable("ACTIVITY_ID") ?? "https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83";
+            var activityPrefLabel = Environment.GetEnvironmentVariable("ACTIVITY_PREF_LABEL") ?? "Jet Skiing";
+
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var q = db.From<ClassTable>()
                 .Join<SellerTable>()
@@ -199,8 +202,8 @@ protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long?
                             {
                                 new Concept
                                 {
-                                    Id = new Uri("https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83"),
-                                    PrefLabel = "Jet Skiing",
+                                    Id = new Uri(activityId),
+                                    PrefLabel = activityPrefLabel,
                                     InScheme = new Uri("https://openactive.io/activity-list")
                                 }
                             }
diff --git a/Examples/BookingSystem.AspNetCore/Program.cs b/Examples/BookingSystem.AspNetCore/Program.cs
index a6cf93f6..c8aac90d 100644
--- a/Examples/BookingSystem.AspNetCore/Program.cs
+++ b/Examples/BookingSystem.AspNetCore/Program.cs
@@ -8,13 +8,18 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            // Initialising fake database (shared with IdentityServer)
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
             FakeBookingSystem.Initialise();
-            CreateWebHostBuilder(args).Build().Run();
+
+            host.Run();
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
+            .CaptureStartupErrors(true)
+            .UseSetting("detailedErrors", "true")
+            .UseStartup<Startup>();
     }
 }
diff --git a/Examples/BookingSystem.AspNetCore/Properties/launchSettings.json b/Examples/BookingSystem.AspNetCore/Properties/launchSettings.json
index 30b0586b..67a8fb1f 100644
--- a/Examples/BookingSystem.AspNetCore/Properties/launchSettings.json
+++ b/Examples/BookingSystem.AspNetCore/Properties/launchSettings.json
@@ -11,7 +11,11 @@
       "applicationUrl": "https://localhost:5001",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "ApplicationHostBaseUrl": "https://localhost:5001"
+        "ApplicationHostBaseUrl": "https://localhost:5001",
+        "REMOTE_STORAGE_CONNECTION_STRING": "",
+        "USE_REMOTE_STORAGE": "true",
+        "DROP_TABLES_ON_RESTART": "true",
+        "OPPORTUNITY_COUNT": "20"
       }
     }
   }
diff --git a/Examples/BookingSystem.AspNetCore/Settings/AppSettings.cs b/Examples/BookingSystem.AspNetCore/Settings/AppSettings.cs
index 6ead5201..29694da0 100644
--- a/Examples/BookingSystem.AspNetCore/Settings/AppSettings.cs
+++ b/Examples/BookingSystem.AspNetCore/Settings/AppSettings.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace BookingSystem
 {
     public class AppSettings
@@ -6,6 +8,8 @@ public class AppSettings
         public string OpenIdIssuerUrl { get; set; }
         public FeatureSettings FeatureFlags { get; set; }
         public PaymentSettings Payment { get; set; }
+        public TimeSpan DataRefresherInterval = TimeSpan.FromHours(6);
+
     }
 
     /**
diff --git a/Examples/BookingSystem.AspNetCore/Startup.cs b/Examples/BookingSystem.AspNetCore/Startup.cs
index da372800..80a68a79 100644
--- a/Examples/BookingSystem.AspNetCore/Startup.cs
+++ b/Examples/BookingSystem.AspNetCore/Startup.cs
@@ -60,7 +60,8 @@ public void ConfigureServices(IServiceCollection services)
                 services.AddAuthorization(options =>
                 {
                     // No authorization checks are performed, this just ensures that the required claims are supplied
-                    options.AddPolicy(OpenActiveScopes.OpenBooking, policy => {
+                    options.AddPolicy(OpenActiveScopes.OpenBooking, policy =>
+                    {
                         policy.RequireClaim(OpenActiveCustomClaimNames.ClientId);
                         policy.RequireClaim(OpenActiveCustomClaimNames.SellerId);
                     });
@@ -72,7 +73,13 @@ public void ConfigureServices(IServiceCollection services)
                 .AddControllers()
                 .AddMvcOptions(options => options.InputFormatters.Insert(0, new OpenBookingInputFormatter()));
 
+            // Add config as a singleton to pipe it through DI to the booking engine and stores
+            services.AddSingleton(x => AppSettings);
+
             services.AddSingleton<IBookingEngine>(sp => EngineConfig.CreateStoreBookingEngine(AppSettings));
+
+            // Add background OrderItem polling
+            services.AddHostedService<FakeDataRefresherService>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -93,7 +100,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             app.UseHttpsRedirection();
             app.UseStaticFiles();
             app.UseRouting();
-
             app.UseAuthentication();
             app.UseAuthorization();
             app.UseEndpoints(endpoints =>
diff --git a/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs
index ef3e865c..2adaf1cb 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs
@@ -44,7 +44,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                     {
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOfflineBookable:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility",
@@ -55,7 +55,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFree:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableUsingPayment:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                              testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility",
@@ -64,7 +64,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFree:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility",
@@ -76,7 +76,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOutsideValidFromBeforeStartDate:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithinValidFromBeforeStartDate;
-                                (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                                (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility {(isValid ? "Within" : "Outside")} Window",
@@ -90,7 +90,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableOutsideWindow:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableWithinWindow;
-                                (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                                (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility {(isValid ? "Within" : "Outside")} Cancellation Window",
@@ -101,7 +101,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                             }
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentOptional:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Optional",
@@ -111,7 +111,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Optional);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentUnavailable:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Unavailable",
@@ -121,7 +121,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Unavailable);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentRequired:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Required",
@@ -131,7 +131,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Required);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNoSpaces:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility No Spaces",
@@ -140,7 +140,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFiveSpaces:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility Five Spaces",
@@ -149,7 +149,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOneSpace:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility One Space",
@@ -158,7 +158,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxNet:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 2,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Tax Net",
@@ -167,7 +167,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxGross:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Tax Gross",
@@ -176,7 +176,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableSellerTermsOfService:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility With Seller Terms Of Service",
@@ -185,7 +185,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAttendeeDetails:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility That Requires Attendee Details",
@@ -195,7 +195,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresAttendeeValidation: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAdditionalDetails:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility That Requires Additional Details",
@@ -205,7 +205,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresAdditionalDetails: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithNegotiation:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility That Allows Proposal Amendment",
@@ -215,7 +215,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 allowProposalAmendment: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNotCancellable:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility Paid That Does Not Allow Full Refund",
@@ -225,7 +225,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 allowCustomerCancellationFullRefund: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableInPast:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility in the Past",
@@ -252,7 +252,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
 
         protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
-            await FakeBookingSystem.Database.DeleteTestFacilitiesFromDataset(testDatasetIdentifier);
+            await FakeBookingSystem.FakeDatabase.DeleteTestFacilitiesFromDataset(testDatasetIdentifier);
         }
 
         protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, FacilityOpportunity idComponents)
@@ -260,19 +260,19 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
             switch (simulateAction)
             {
                 case ChangeOfLogisticsTimeSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateFacilitySlotStartAndEndTimeByPeriodInMins(idComponents.SlotId.Value, 60))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateFacilitySlotStartAndEndTimeByPeriodInMins(idComponents.SlotId.Value, 60))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsNameSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateFacilityUseName(idComponents.SlotId.Value, "Updated Facility Title"))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateFacilityUseName(idComponents.SlotId.Value, "Updated Facility Title"))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -286,6 +286,9 @@ protected override async 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 override async Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
+            var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";
+            var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";
+
             // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerId (this is not required if using a Single Seller)
 
             // Additionally this method must check that there are enough spaces in each entry
@@ -294,13 +297,13 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
 
             var query = await Task.WhenAll(orderItemContexts.Select(async orderItemContext =>
             {
-                var getOccurrenceInfoResult = await FakeBookingSystem.Database.GetSlotAndBookedOrderItemInfoBySlotId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
+                var getOccurrenceInfoResult = await FakeBookingSystem.FakeDatabase.GetSlotAndBookedOrderItemInfoBySlotId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
                 var (hasFoundOccurrence, facility, slot, bookedOrderItemInfo) = getOccurrenceInfoResult;
                 if (hasFoundOccurrence == false)
                 {
                     return null;
                 }
-                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.Database.GetNumberOfOtherLeasesForSlot(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
+                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.FakeDatabase.GetNumberOfOtherLeasesForSlot(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
 
                 return new
                 {
@@ -349,8 +352,8 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
                                 FacilityType = new List<Concept> {
                                     new Concept
                                     {
-                                        Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),
-                                        PrefLabel = "Squash Court",
+                                        Id = new Uri(facilityTypeId),
+                                        PrefLabel = facilityTypePrefLabel,
                                         InScheme = new Uri("https://openactive.io/facility-types")
                                     }
                                 }
diff --git a/Examples/BookingSystem.AspNetCore/Stores/OrderStore.cs b/Examples/BookingSystem.AspNetCore/Stores/OrderStore.cs
index f7cbde2f..f5b5d5c6 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/OrderStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/OrderStore.cs
@@ -35,7 +35,7 @@ public override async Task<bool> CustomerCancelOrderItems(OrderIdComponents orde
         {
             try
             {
-                return await FakeBookingSystem.Database.CancelOrderItems(
+                return await FakeBookingSystem.FakeDatabase.CancelOrderItems(
                     orderId.ClientId,
                     sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                     orderId.uuid,
@@ -54,7 +54,7 @@ public override async Task<bool> CustomerCancelOrderItems(OrderIdComponents orde
         /// <returns>True if OrderProposal found, False if OrderProposal not found</returns>
         public override async Task<bool> CustomerRejectOrderProposal(OrderIdComponents orderId, SimpleIdComponents sellerId)
         {
-            return await FakeBookingSystem.Database.RejectOrderProposal(orderId.ClientId, sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */, orderId.uuid, true);
+            return await FakeBookingSystem.FakeDatabase.RejectOrderProposal(orderId.ClientId, sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */, orderId.uuid, true);
         }
 
         public override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, OrderIdComponents orderId)
@@ -66,7 +66,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
-                    if (!await FakeBookingSystem.Database.AcceptOrderProposal(orderId.uuid))
+                    if (!await FakeBookingSystem.FakeDatabase.AcceptOrderProposal(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -77,7 +77,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
                     var version = Guid.NewGuid();
-                    if (!await FakeBookingSystem.Database.AmendOrderProposal(orderId.uuid, version))
+                    if (!await FakeBookingSystem.FakeDatabase.AmendOrderProposal(orderId.uuid, version))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -87,7 +87,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
-                    if (!await FakeBookingSystem.Database.RejectOrderProposal(null, null, orderId.uuid, false))
+                    if (!await FakeBookingSystem.FakeDatabase.RejectOrderProposal(null, null, orderId.uuid, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -97,7 +97,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false, true))
+                    if (!await FakeBookingSystem.FakeDatabase.CancelOrderItems(null, null, orderId.uuid, null, false, true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -107,7 +107,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false))
+                    if (!await FakeBookingSystem.FakeDatabase.CancelOrderItems(null, null, orderId.uuid, null, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -117,7 +117,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessCode: true))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateAccess(orderId.uuid, updateAccessCode: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -127,7 +127,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessPass: true))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateAccess(orderId.uuid, updateAccessPass: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -137,7 +137,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, true))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateOpportunityAttendance(orderId.uuid, true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -147,7 +147,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, false))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateOpportunityAttendance(orderId.uuid, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -157,7 +157,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.AddCustomerNotice(orderId.uuid))
+                    if (!await FakeBookingSystem.FakeDatabase.AddCustomerNotice(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -167,7 +167,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.ReplaceOrderOpportunity(orderId.uuid))
+                    if (!await FakeBookingSystem.FakeDatabase.ReplaceOrderOpportunity(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -177,7 +177,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessChannel: true))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateAccess(orderId.uuid, updateAccessChannel: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -267,7 +267,7 @@ public override ValueTask UpdateLease(
         public override async Task DeleteLease(OrderIdComponents orderId, SimpleIdComponents sellerId)
         {
             // Note if no lease support, simply do nothing here
-            await FakeBookingSystem.Database.DeleteLease(
+            await FakeBookingSystem.FakeDatabase.DeleteLease(
                 orderId.ClientId,
                 orderId.uuid,
                 sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */
@@ -358,7 +358,7 @@ public override ValueTask UpdateOrderProposal(OrderProposal responseOrderProposa
 
         public override async Task<DeleteOrderResult> DeleteOrder(OrderIdComponents orderId, SimpleIdComponents sellerId)
         {
-            var result = await FakeBookingSystem.Database.DeleteOrder(
+            var result = await FakeBookingSystem.FakeDatabase.DeleteOrder(
                 orderId.ClientId,
                 orderId.uuid,
                 sellerId.IdLong ?? null /* Small hack to allow use of FakeDatabase when in Single Seller mode */);
@@ -382,7 +382,7 @@ public override async Task<bool> CreateOrderFromOrderProposal(OrderIdComponents
             // TODO more elegantly extract version UUID from orderProposalVersion (probably much further up the stack?)
             var version = new Guid(orderProposalVersion.ToString().Split('/').Last());
 
-            var result = await FakeBookingSystem.Database.BookOrderProposal(
+            var result = await FakeBookingSystem.FakeDatabase.BookOrderProposal(
                 orderId.ClientId,
                 sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                 orderId.uuid,
@@ -442,7 +442,7 @@ public static Order RenderOrderFromDatabaseResult(Uri orderId, OrderTable dbOrde
 
         public override async Task<Order> GetOrderStatus(OrderIdComponents orderId, SimpleIdComponents sellerId, ILegalEntity seller)
         {
-            var (getOrderResult, dbOrder, dbOrderItems) = await FakeBookingSystem.Database.GetOrderAndOrderItems(
+            var (getOrderResult, dbOrder, dbOrderItems) = await FakeBookingSystem.FakeDatabase.GetOrderAndOrderItems(
                 orderId.ClientId,
                 sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                 orderId.uuid);
diff --git a/Examples/BookingSystem.AspNetCore/Stores/OrderTransaction.cs b/Examples/BookingSystem.AspNetCore/Stores/OrderTransaction.cs
index 6d433a54..d2759641 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/OrderTransaction.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/OrderTransaction.cs
@@ -10,7 +10,7 @@ public sealed class OrderTransaction : IDatabaseTransaction
 
         public OrderTransaction()
         {
-            FakeDatabaseTransaction = new FakeDatabaseTransaction(FakeBookingSystem.Database);
+            FakeDatabaseTransaction = new FakeDatabaseTransaction(FakeBookingSystem.FakeDatabase);
         }
 
         public async ValueTask Commit()
diff --git a/Examples/BookingSystem.AspNetCore/Stores/SellerStore.cs b/Examples/BookingSystem.AspNetCore/Stores/SellerStore.cs
index 5dda02fa..7f8be1bb 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/SellerStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/SellerStore.cs
@@ -57,7 +57,7 @@ protected override async ValueTask<ILegalEntity> GetSeller(SimpleIdComponents se
             }
 
             // Otherwise it may be looked up based on supplied sellerIdComponents which are extracted from the sellerId.
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var seller = db.SingleById<SellerTable>(sellerIdComponents.IdLong);
                 if (seller == null)
diff --git a/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs b/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
index a71a0976..024d6e4c 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
@@ -44,7 +44,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                     switch (criteria)
                     {
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Event",
@@ -55,7 +55,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFree:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableUsingPayment:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event",
@@ -67,7 +67,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOutsideValidFromBeforeStartDate:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithinValidFromBeforeStartDate;
-                                (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                                (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event {(isValid ? "Within" : "Outside")} Window",
@@ -81,7 +81,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableOutsideWindow:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableWithinWindow;
-                                (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                                (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event {(isValid ? "Within" : "Outside")} Cancellation Window",
@@ -92,7 +92,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                             }
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentOptional:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Optional",
@@ -102,7 +102,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Optional);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentUnavailable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Unavailable",
@@ -112,7 +112,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Unavailable);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentRequired:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Required",
@@ -122,7 +122,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Required);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFree:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event",
@@ -131,7 +131,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNoSpaces:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event No Spaces",
@@ -140,7 +140,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFiveSpaces:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event Five Spaces",
@@ -149,7 +149,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOneSpace:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event One Space",
@@ -158,7 +158,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxNet:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 2,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Tax Net",
@@ -167,7 +167,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxGross:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Tax Gross",
@@ -176,7 +176,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableSellerTermsOfService:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Event With Seller Terms Of Service",
@@ -185,7 +185,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAttendeeDetails:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Requires Attendee Details",
@@ -195,7 +195,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresAttendeeValidation: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAdditionalDetails:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Requires Additional Details",
@@ -205,7 +205,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresAdditionalDetails: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOnlineBookable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Virtual Event",
@@ -215,7 +215,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 isOnlineOrMixedAttendanceMode: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOfflineBookable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Offline Event",
@@ -225,7 +225,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 isOnlineOrMixedAttendanceMode: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithNegotiation:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Allows Proposal Amendment",
@@ -235,7 +235,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 allowProposalAmendment: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNotCancellable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid That Does Not Allow Full Refund",
@@ -245,7 +245,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 allowCustomerCancellationFullRefund: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableInPast:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Sesssion in the Past",
@@ -272,7 +272,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
 
         protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
-            await FakeBookingSystem.Database.DeleteTestClassesFromDataset(testDatasetIdentifier);
+            await FakeBookingSystem.FakeDatabase.DeleteTestClassesFromDataset(testDatasetIdentifier);
         }
 
         protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, SessionOpportunity idComponents)
@@ -280,19 +280,19 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
             switch (simulateAction)
             {
                 case ChangeOfLogisticsTimeSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateScheduledSessionStartAndEndTimeByPeriodInMins(idComponents.ScheduledSessionId.Value, 60))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateScheduledSessionStartAndEndTimeByPeriodInMins(idComponents.ScheduledSessionId.Value, 60))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsNameSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateClassTitle(idComponents.ScheduledSessionId.Value, "Updated Class Title"))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateClassTitle(idComponents.ScheduledSessionId.Value, "Updated Class Title"))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -314,14 +314,14 @@ protected override async Task GetOrderItems(List<OrderItemContext<SessionOpportu
 
             var query = await Task.WhenAll(orderItemContexts.Select(async orderItemContext =>
             {
-                var getOccurrenceResultAndRows = await FakeBookingSystem.Database.GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
+                var getOccurrenceResultAndRows = await FakeBookingSystem.FakeDatabase.GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
                 var (hasFoundOccurrence, @class, occurrence, bookedOrderItemInfo) = getOccurrenceResultAndRows;
 
                 if (hasFoundOccurrence == false)
                 {
                     return null;
                 }
-                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.Database.GetNumberOfOtherLeaseForOccurrence(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
+                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.FakeDatabase.GetNumberOfOtherLeaseForOccurrence(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
 
                 return new
                 {
diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj
index c89ec8a1..da7eae36 100644
--- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj
+++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj
@@ -377,6 +377,19 @@
       <Private>True</Private>
       <HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
     </Reference>
+    <Reference Include="ServiceStack.Interfaces">
+      <HintPath>..\..\packages\ServiceStack.Interfaces.5.11.0\lib\net45\ServiceStack.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text">
+      <HintPath>..\..\packages\ServiceStack.Text.5.11.0\lib\net45\ServiceStack.Text.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Common">
+      <HintPath>..\..\packages\ServiceStack.Common.5.11.0\lib\net45\ServiceStack.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.OrmLite">
+      <HintPath>..\..\packages\ServiceStack.OrmLite.5.11.0\lib\net45\ServiceStack.OrmLite.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.OrmLite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=null" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="EntityFramework">
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
index caa10fbb..8a0ead09 100644
--- a/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
+++ b/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
@@ -24,7 +24,10 @@ public AcmeFacilityUseRpdeGenerator(AppSettings appSettings)
 
         protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";
+            var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";
+
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var q = db.From<FacilityUseTable>()
                 .Join<SellerTable>()
@@ -107,8 +110,8 @@ protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? af
                             FacilityType = new List<Concept> {
                                 new Concept
                                 {
-                                    Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),
-                                    PrefLabel = "Squash Court",
+                                    Id = new Uri(facilityTypeId),
+                                    PrefLabel = facilityTypePrefLabel,
                                     InScheme = new Uri("https://openactive.io/facility-types")
                                 }
                             }
@@ -133,7 +136,7 @@ public AcmeFacilityUseSlotRpdeGenerator(AppSettings appSettings)
 
         protected override async Task<List<RpdeItem<Slot>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var query = db.Select<SlotTable>()
                 .OrderBy(x => x.Modified)
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/OrdersFeed.cs b/Examples/BookingSystem.AspNetFramework/Feeds/OrdersFeed.cs
index 6fe7d2e2..53784c9e 100644
--- a/Examples/BookingSystem.AspNetFramework/Feeds/OrdersFeed.cs
+++ b/Examples/BookingSystem.AspNetFramework/Feeds/OrdersFeed.cs
@@ -27,7 +27,7 @@ protected override async Task<List<RpdeItem>> GetRPDEItems(string clientId, long
             // and update this class to inherit from OrdersRPDEFeedIncrementingUniqueChangeNumber
             // (to use afterChangeNumber, instead of afterTimestamp and afterId)
 
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 long afterTimestampLong = afterTimestamp ?? 0;
                 var q = db.From<OrderTable>()
@@ -126,7 +126,7 @@ public AcmeOrderProposalsFeedRpdeGenerator(AppSettings appSettings)
 
         protected override async Task<List<RpdeItem>> GetRPDEItems(string clientId, long? afterTimestamp, string afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 long afterTimestampLong = afterTimestamp ?? 0;
                 var q = db.From<OrderTable>()
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
index 5d0e2c1b..8ea2243f 100644
--- a/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
+++ b/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
@@ -17,7 +17,7 @@ public class AcmeScheduledSessionRpdeGenerator : RpdeFeedModifiedTimestampAndIdL
 
         protected override async Task<List<RpdeItem<ScheduledSession>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var query = db.Select<OccurrenceTable>()
                 .OrderBy(x => x.Modified)
@@ -74,7 +74,10 @@ public AcmeSessionSeriesRpdeGenerator(AppSettings appSettings)
 
         protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            var activityId = Environment.GetEnvironmentVariable("ACTIVITY_ID") ?? "https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83";
+            var activityPrefLabel = Environment.GetEnvironmentVariable("ACTIVITY_PREF_LABEL") ?? "Jet Skiing";
+
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var q = db.From<ClassTable>()
                 .Join<SellerTable>()
@@ -199,8 +202,8 @@ protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long?
                             {
                                 new Concept
                                 {
-                                    Id = new Uri("https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83"),
-                                    PrefLabel = "Jet Skiing",
+                                    Id = new Uri(activityId),
+                                    PrefLabel = activityPrefLabel,
                                     InScheme = new Uri("https://openactive.io/activity-list")
                                 }
                             }
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
index ef3e865c..2adaf1cb 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
@@ -44,7 +44,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                     {
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOfflineBookable:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility",
@@ -55,7 +55,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFree:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableUsingPayment:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                              testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility",
@@ -64,7 +64,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFree:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility",
@@ -76,7 +76,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOutsideValidFromBeforeStartDate:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithinValidFromBeforeStartDate;
-                                (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                                (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility {(isValid ? "Within" : "Outside")} Window",
@@ -90,7 +90,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableOutsideWindow:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableWithinWindow;
-                                (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                                (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility {(isValid ? "Within" : "Outside")} Cancellation Window",
@@ -101,7 +101,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                             }
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentOptional:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Optional",
@@ -111,7 +111,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Optional);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentUnavailable:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Unavailable",
@@ -121,7 +121,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Unavailable);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentRequired:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Prepayment Required",
@@ -131,7 +131,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 prepayment: RequiredStatusType.Required);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNoSpaces:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility No Spaces",
@@ -140,7 +140,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFiveSpaces:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility Five Spaces",
@@ -149,7 +149,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOneSpace:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Facility One Space",
@@ -158,7 +158,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxNet:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 2,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Tax Net",
@@ -167,7 +167,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxGross:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility Tax Gross",
@@ -176,7 +176,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableSellerTermsOfService:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility With Seller Terms Of Service",
@@ -185,7 +185,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAttendeeDetails:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility That Requires Attendee Details",
@@ -195,7 +195,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresAttendeeValidation: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAdditionalDetails:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility That Requires Additional Details",
@@ -205,7 +205,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 requiresAdditionalDetails: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithNegotiation:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Facility That Allows Proposal Amendment",
@@ -215,7 +215,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 allowProposalAmendment: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNotCancellable:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility Paid That Does Not Allow Full Refund",
@@ -225,7 +225,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
                                 allowCustomerCancellationFullRefund: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableInPast:
-                            (facilityId, slotId) = await FakeBookingSystem.Database.AddFacility(
+                            (facilityId, slotId) = await FakeBookingSystem.FakeDatabase.AddFacility(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Facility in the Past",
@@ -252,7 +252,7 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
 
         protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
-            await FakeBookingSystem.Database.DeleteTestFacilitiesFromDataset(testDatasetIdentifier);
+            await FakeBookingSystem.FakeDatabase.DeleteTestFacilitiesFromDataset(testDatasetIdentifier);
         }
 
         protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, FacilityOpportunity idComponents)
@@ -260,19 +260,19 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
             switch (simulateAction)
             {
                 case ChangeOfLogisticsTimeSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateFacilitySlotStartAndEndTimeByPeriodInMins(idComponents.SlotId.Value, 60))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateFacilitySlotStartAndEndTimeByPeriodInMins(idComponents.SlotId.Value, 60))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsNameSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateFacilityUseName(idComponents.SlotId.Value, "Updated Facility Title"))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateFacilityUseName(idComponents.SlotId.Value, "Updated Facility Title"))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -286,6 +286,9 @@ protected override async 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 override async Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
+            var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";
+            var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";
+
             // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerId (this is not required if using a Single Seller)
 
             // Additionally this method must check that there are enough spaces in each entry
@@ -294,13 +297,13 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
 
             var query = await Task.WhenAll(orderItemContexts.Select(async orderItemContext =>
             {
-                var getOccurrenceInfoResult = await FakeBookingSystem.Database.GetSlotAndBookedOrderItemInfoBySlotId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
+                var getOccurrenceInfoResult = await FakeBookingSystem.FakeDatabase.GetSlotAndBookedOrderItemInfoBySlotId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
                 var (hasFoundOccurrence, facility, slot, bookedOrderItemInfo) = getOccurrenceInfoResult;
                 if (hasFoundOccurrence == false)
                 {
                     return null;
                 }
-                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.Database.GetNumberOfOtherLeasesForSlot(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
+                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.FakeDatabase.GetNumberOfOtherLeasesForSlot(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.SlotId);
 
                 return new
                 {
@@ -349,8 +352,8 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
                                 FacilityType = new List<Concept> {
                                     new Concept
                                     {
-                                        Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),
-                                        PrefLabel = "Squash Court",
+                                        Id = new Uri(facilityTypeId),
+                                        PrefLabel = facilityTypePrefLabel,
                                         InScheme = new Uri("https://openactive.io/facility-types")
                                     }
                                 }
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/OrderStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/OrderStore.cs
index f7cbde2f..f5b5d5c6 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/OrderStore.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/OrderStore.cs
@@ -35,7 +35,7 @@ public override async Task<bool> CustomerCancelOrderItems(OrderIdComponents orde
         {
             try
             {
-                return await FakeBookingSystem.Database.CancelOrderItems(
+                return await FakeBookingSystem.FakeDatabase.CancelOrderItems(
                     orderId.ClientId,
                     sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                     orderId.uuid,
@@ -54,7 +54,7 @@ public override async Task<bool> CustomerCancelOrderItems(OrderIdComponents orde
         /// <returns>True if OrderProposal found, False if OrderProposal not found</returns>
         public override async Task<bool> CustomerRejectOrderProposal(OrderIdComponents orderId, SimpleIdComponents sellerId)
         {
-            return await FakeBookingSystem.Database.RejectOrderProposal(orderId.ClientId, sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */, orderId.uuid, true);
+            return await FakeBookingSystem.FakeDatabase.RejectOrderProposal(orderId.ClientId, sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */, orderId.uuid, true);
         }
 
         public override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, OrderIdComponents orderId)
@@ -66,7 +66,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
-                    if (!await FakeBookingSystem.Database.AcceptOrderProposal(orderId.uuid))
+                    if (!await FakeBookingSystem.FakeDatabase.AcceptOrderProposal(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -77,7 +77,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
                     var version = Guid.NewGuid();
-                    if (!await FakeBookingSystem.Database.AmendOrderProposal(orderId.uuid, version))
+                    if (!await FakeBookingSystem.FakeDatabase.AmendOrderProposal(orderId.uuid, version))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -87,7 +87,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected OrderProposal");
                     }
-                    if (!await FakeBookingSystem.Database.RejectOrderProposal(null, null, orderId.uuid, false))
+                    if (!await FakeBookingSystem.FakeDatabase.RejectOrderProposal(null, null, orderId.uuid, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -97,7 +97,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false, true))
+                    if (!await FakeBookingSystem.FakeDatabase.CancelOrderItems(null, null, orderId.uuid, null, false, true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -107,7 +107,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.CancelOrderItems(null, null, orderId.uuid, null, false))
+                    if (!await FakeBookingSystem.FakeDatabase.CancelOrderItems(null, null, orderId.uuid, null, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -117,7 +117,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessCode: true))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateAccess(orderId.uuid, updateAccessCode: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -127,7 +127,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessPass: true))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateAccess(orderId.uuid, updateAccessPass: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -137,7 +137,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, true))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateOpportunityAttendance(orderId.uuid, true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -147,7 +147,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateOpportunityAttendance(orderId.uuid, false))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateOpportunityAttendance(orderId.uuid, false))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -157,7 +157,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.AddCustomerNotice(orderId.uuid))
+                    if (!await FakeBookingSystem.FakeDatabase.AddCustomerNotice(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -167,7 +167,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.ReplaceOrderOpportunity(orderId.uuid))
+                    if (!await FakeBookingSystem.FakeDatabase.ReplaceOrderOpportunity(orderId.uuid))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -177,7 +177,7 @@ public override async Task TriggerTestAction(OpenBookingSimulateAction simulateA
                     {
                         throw new OpenBookingException(new UnexpectedOrderTypeError(), "Expected Order");
                     }
-                    if (!await FakeBookingSystem.Database.UpdateAccess(orderId.uuid, updateAccessChannel: true))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateAccess(orderId.uuid, updateAccessChannel: true))
                     {
                         throw new OpenBookingException(new UnknownOrderError());
                     }
@@ -267,7 +267,7 @@ public override ValueTask UpdateLease(
         public override async Task DeleteLease(OrderIdComponents orderId, SimpleIdComponents sellerId)
         {
             // Note if no lease support, simply do nothing here
-            await FakeBookingSystem.Database.DeleteLease(
+            await FakeBookingSystem.FakeDatabase.DeleteLease(
                 orderId.ClientId,
                 orderId.uuid,
                 sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */
@@ -358,7 +358,7 @@ public override ValueTask UpdateOrderProposal(OrderProposal responseOrderProposa
 
         public override async Task<DeleteOrderResult> DeleteOrder(OrderIdComponents orderId, SimpleIdComponents sellerId)
         {
-            var result = await FakeBookingSystem.Database.DeleteOrder(
+            var result = await FakeBookingSystem.FakeDatabase.DeleteOrder(
                 orderId.ClientId,
                 orderId.uuid,
                 sellerId.IdLong ?? null /* Small hack to allow use of FakeDatabase when in Single Seller mode */);
@@ -382,7 +382,7 @@ public override async Task<bool> CreateOrderFromOrderProposal(OrderIdComponents
             // TODO more elegantly extract version UUID from orderProposalVersion (probably much further up the stack?)
             var version = new Guid(orderProposalVersion.ToString().Split('/').Last());
 
-            var result = await FakeBookingSystem.Database.BookOrderProposal(
+            var result = await FakeBookingSystem.FakeDatabase.BookOrderProposal(
                 orderId.ClientId,
                 sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                 orderId.uuid,
@@ -442,7 +442,7 @@ public static Order RenderOrderFromDatabaseResult(Uri orderId, OrderTable dbOrde
 
         public override async Task<Order> GetOrderStatus(OrderIdComponents orderId, SimpleIdComponents sellerId, ILegalEntity seller)
         {
-            var (getOrderResult, dbOrder, dbOrderItems) = await FakeBookingSystem.Database.GetOrderAndOrderItems(
+            var (getOrderResult, dbOrder, dbOrderItems) = await FakeBookingSystem.FakeDatabase.GetOrderAndOrderItems(
                 orderId.ClientId,
                 sellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                 orderId.uuid);
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/OrderTransaction.cs b/Examples/BookingSystem.AspNetFramework/Stores/OrderTransaction.cs
index 6d433a54..d2759641 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/OrderTransaction.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/OrderTransaction.cs
@@ -10,7 +10,7 @@ public sealed class OrderTransaction : IDatabaseTransaction
 
         public OrderTransaction()
         {
-            FakeDatabaseTransaction = new FakeDatabaseTransaction(FakeBookingSystem.Database);
+            FakeDatabaseTransaction = new FakeDatabaseTransaction(FakeBookingSystem.FakeDatabase);
         }
 
         public async ValueTask Commit()
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/SellerStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/SellerStore.cs
index 5dda02fa..7f8be1bb 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/SellerStore.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/SellerStore.cs
@@ -57,7 +57,7 @@ protected override async ValueTask<ILegalEntity> GetSeller(SimpleIdComponents se
             }
 
             // Otherwise it may be looked up based on supplied sellerIdComponents which are extracted from the sellerId.
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var seller = db.SingleById<SellerTable>(sellerIdComponents.IdLong);
                 if (seller == null)
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs
index a71a0976..024d6e4c 100644
--- a/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs
+++ b/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs
@@ -44,7 +44,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                     switch (criteria)
                     {
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Event",
@@ -55,7 +55,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellable:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFree:
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableUsingPayment:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event",
@@ -67,7 +67,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOutsideValidFromBeforeStartDate:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithinValidFromBeforeStartDate;
-                                (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                                (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event {(isValid ? "Within" : "Outside")} Window",
@@ -81,7 +81,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableOutsideWindow:
                             {
                                 var isValid = criteria == TestOpportunityCriteriaEnumeration.TestOpportunityBookableCancellableWithinWindow;
-                                (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                                (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                     testDatasetIdentifier,
                                     sellerId,
                                     $"[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event {(isValid ? "Within" : "Outside")} Cancellation Window",
@@ -92,7 +92,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                             }
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentOptional:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Optional",
@@ -102,7 +102,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Optional);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentUnavailable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Unavailable",
@@ -112,7 +112,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Unavailable);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreePrepaymentRequired:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Prepayment Required",
@@ -122,7 +122,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 prepayment: RequiredStatusType.Required);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFree:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event",
@@ -131,7 +131,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNoSpaces:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event No Spaces",
@@ -140,7 +140,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableFiveSpaces:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event Five Spaces",
@@ -149,7 +149,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableOneSpace:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Free Event One Space",
@@ -158,7 +158,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxNet:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 2,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Tax Net",
@@ -167,7 +167,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNonFreeTaxGross:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event Tax Gross",
@@ -176,7 +176,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableSellerTermsOfService:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 1,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Event With Seller Terms Of Service",
@@ -185,7 +185,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresApproval);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAttendeeDetails:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Requires Attendee Details",
@@ -195,7 +195,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresAttendeeValidation: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableAdditionalDetails:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Requires Additional Details",
@@ -205,7 +205,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 requiresAdditionalDetails: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOnlineBookable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Virtual Event",
@@ -215,7 +215,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 isOnlineOrMixedAttendanceMode: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityOfflineBookable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Offline Event",
@@ -225,7 +225,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 isOnlineOrMixedAttendanceMode: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableWithNegotiation:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid Event That Allows Proposal Amendment",
@@ -235,7 +235,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 allowProposalAmendment: true);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableNotCancellable:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Paid That Does Not Allow Full Refund",
@@ -245,7 +245,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
                                 allowCustomerCancellationFullRefund: false);
                             break;
                         case TestOpportunityCriteriaEnumeration.TestOpportunityBookableInPast:
-                            (classId, occurrenceId) = await FakeBookingSystem.Database.AddClass(
+                            (classId, occurrenceId) = await FakeBookingSystem.FakeDatabase.AddClass(
                                 testDatasetIdentifier,
                                 sellerId,
                                 "[OPEN BOOKING API TEST INTERFACE] Bookable Sesssion in the Past",
@@ -272,7 +272,7 @@ protected override async Task<SessionOpportunity> CreateOpportunityWithinTestDat
 
         protected override async Task DeleteTestDataset(string testDatasetIdentifier)
         {
-            await FakeBookingSystem.Database.DeleteTestClassesFromDataset(testDatasetIdentifier);
+            await FakeBookingSystem.FakeDatabase.DeleteTestClassesFromDataset(testDatasetIdentifier);
         }
 
         protected override async Task TriggerTestAction(OpenBookingSimulateAction simulateAction, SessionOpportunity idComponents)
@@ -280,19 +280,19 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
             switch (simulateAction)
             {
                 case ChangeOfLogisticsTimeSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateScheduledSessionStartAndEndTimeByPeriodInMins(idComponents.ScheduledSessionId.Value, 60))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateScheduledSessionStartAndEndTimeByPeriodInMins(idComponents.ScheduledSessionId.Value, 60))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsNameSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateClassTitle(idComponents.ScheduledSessionId.Value, "Updated Class Title"))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateClassTitle(idComponents.ScheduledSessionId.Value, "Updated Class Title"))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!await FakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
+                    if (!await FakeBookingSystem.FakeDatabase.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -314,14 +314,14 @@ protected override async Task GetOrderItems(List<OrderItemContext<SessionOpportu
 
             var query = await Task.WhenAll(orderItemContexts.Select(async orderItemContext =>
             {
-                var getOccurrenceResultAndRows = await FakeBookingSystem.Database.GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
+                var getOccurrenceResultAndRows = await FakeBookingSystem.FakeDatabase.GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
                 var (hasFoundOccurrence, @class, occurrence, bookedOrderItemInfo) = getOccurrenceResultAndRows;
 
                 if (hasFoundOccurrence == false)
                 {
                     return null;
                 }
-                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.Database.GetNumberOfOtherLeaseForOccurrence(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
+                var remainingUsesIncludingOtherLeases = await FakeBookingSystem.FakeDatabase.GetNumberOfOtherLeaseForOccurrence(flowContext.OrderId.uuid, orderItemContext.RequestBookableOpportunityOfferId.ScheduledSessionId);
 
                 return new
                 {
diff --git a/Examples/BookingSystem.AspNetFramework/Web.config b/Examples/BookingSystem.AspNetFramework/Web.config
index c13ebba0..80758c20 100644
--- a/Examples/BookingSystem.AspNetFramework/Web.config
+++ b/Examples/BookingSystem.AspNetFramework/Web.config
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   https://go.microsoft.com/fwlink/?LinkId=301879
   -->
 <configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-  </configSections>
-  <connectionStrings>
-    <add name="DefaultConnection" connectionString="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\aspnet-BookingSystem.AspNetFramework-20191026015849.mdf;Initial Catalog=aspnet-BookingSystem.AspNetFramework-20191026015849;Integrated Security=True" providerName="System.Data.SqlClient"/>
-  </connectionStrings>
-  <appSettings>
-    <add key="owin:AutomaticAppStartup" value="false"/>
-    <add key="ApplicationHostBaseUrl" value="http://localhost:5000"/>
-    <add key="AccountId" value="SN1593"/>
-    <add key="PaymentProviderId" value="STRIPE"/>
-    <add key="TaxCalculationB2B" value="true"/>
-    <add key="TaxCalculationB2C" value="true"/>
-  </appSettings>
-  <!--
+	<configSections>
+		<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+	</configSections>
+	<connectionStrings>
+		<add name="DefaultConnection" connectionString="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\aspnet-BookingSystem.AspNetFramework-20191026015849.mdf;Initial Catalog=aspnet-BookingSystem.AspNetFramework-20191026015849;Integrated Security=True" providerName="System.Data.SqlClient" />
+	</connectionStrings>
+	<appSettings>
+		<add key="owin:AutomaticAppStartup" value="false" />
+		<add key="ApplicationHostBaseUrl" value="http://localhost:5000" />
+		<add key="AccountId" value="SN1593" />
+		<add key="PaymentProviderId" value="STRIPE" />
+		<add key="TaxCalculationB2B" value="true" />
+		<add key="TaxCalculationB2C" value="true" />
+	</appSettings>
+	<!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
 
     The following attributes can be set on the <httpRuntime> tag.
@@ -26,363 +26,383 @@
         <httpRuntime targetFramework="4.6.2" />
       </system.Web>
   -->
-  <system.web>
-    <authentication mode="None"/>
-    <compilation debug="true" targetFramework="4.6.2">
-      <assemblies>
-        <add assembly="System.Data.OracleClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
-        <add assembly="System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
-        <add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
-        <add assembly="System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
-        <add assembly="System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
-        <add assembly="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
-        <add assembly="System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
-        <add assembly="System.ComponentModel.Composition, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
-      </assemblies>
-    </compilation>
-    <httpRuntime targetFramework="4.6.1"/>
-  </system.web>
-  <system.webServer>
-    <modules>
-      <remove name="FormsAuthentication"/>
-    </modules>
-    <handlers>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
-      <remove name="OPTIONSVerbHandler"/>
-      <remove name="TRACEVerbHandler"/>
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
-    </handlers>
-    <httpErrors errorMode="Custom" existingResponse="Auto">
-      <remove statusCode="404" subStatusCode="-1"/>
-      <remove statusCode="405" subStatusCode="-1"/>
-      <remove statusCode="429" subStatusCode="-1"/>
-      <remove statusCode="403" subStatusCode="-1"/>
-      <error statusCode="404" path="/api/openbooking/error/404" responseMode="ExecuteURL"/>
-      <error statusCode="405" path="/api/openbooking/error/405" responseMode="ExecuteURL"/>
-      <error statusCode="429" path="/api/openbooking/error/429" responseMode="ExecuteURL"/>
-      <error statusCode="403" path="/api/openbooking/error/403" responseMode="ExecuteURL"/>
-    </httpErrors>
-  </system.webServer>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.1.0" newVersion="5.2.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.1.0" newVersion="5.2.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Schema.NET" publicKeyToken="fc5550082a9c642c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.0.1.0" newVersion="7.0.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
-    </compilers>
-  </system.codedom>
+	<system.web>
+		<authentication mode="None" />
+		<compilation debug="true" targetFramework="4.6.2">
+			<assemblies>
+				<add assembly="System.Data.OracleClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Net.Http.WebRequest, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="System.ComponentModel.Composition, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="System.Web.Entity" />
+				<add assembly="System.Web.ApplicationServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<add assembly="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="ServiceStack.OrmLite, Version=5.0.0.0, Culture=neutral, PublicKeyToken=null" />
+				<add assembly="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+			</assemblies>
+		</compilation>
+		<httpRuntime targetFramework="4.6.1" />
+	</system.web>
+	<system.webServer>
+		<modules>
+			<remove name="FormsAuthentication" />
+		</modules>
+		<handlers>
+			<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+			<remove name="OPTIONSVerbHandler" />
+			<remove name="TRACEVerbHandler" />
+			<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+		</handlers>
+		<httpErrors errorMode="Custom" existingResponse="Auto">
+			<remove statusCode="404" subStatusCode="-1" />
+			<remove statusCode="405" subStatusCode="-1" />
+			<remove statusCode="429" subStatusCode="-1" />
+			<remove statusCode="403" subStatusCode="-1" />
+			<error statusCode="404" path="/api/openbooking/error/404" responseMode="ExecuteURL" />
+			<error statusCode="405" path="/api/openbooking/error/405" responseMode="ExecuteURL" />
+			<error statusCode="429" path="/api/openbooking/error/429" responseMode="ExecuteURL" />
+			<error statusCode="403" path="/api/openbooking/error/403" responseMode="ExecuteURL" />
+		</httpErrors>
+	</system.webServer>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
+				<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
+				<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.2.1.0" newVersion="5.2.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.2.1.0" newVersion="5.2.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Schema.NET" publicKeyToken="fc5550082a9c642c" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-7.0.1.0" newVersion="7.0.1.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+	<system.codedom>
+		<compilers>
+			<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+			<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
+		</compilers>
+	</system.codedom>
 </configuration>
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetFramework/packages.config b/Examples/BookingSystem.AspNetFramework/packages.config
index 38b069d0..ad9bac46 100644
--- a/Examples/BookingSystem.AspNetFramework/packages.config
+++ b/Examples/BookingSystem.AspNetFramework/packages.config
@@ -1,130 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Antlr" version="3.5.0.2" targetFramework="net461" />
-  <package id="Bogus" version="33.0.2" targetFramework="net461" />
-  <package id="bootstrap" version="3.4.1" targetFramework="net461" />
-  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
-  <package id="IdentityModel" version="3.10.10" targetFramework="net461" />
-  <package id="IdentityServer4" version="2.5.3" targetFramework="net461" />
-  <package id="IdentityServer4.Storage" version="2.5.3" targetFramework="net461" />
-  <package id="jQuery" version="3.3.1" targetFramework="net461" />
-  <package id="jQuery.Validation" version="1.17.0" targetFramework="net461" />
-  <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
-  <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.2" targetFramework="net461" />
-  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net461" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.Cookies" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.Core" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.OAuth" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authorization" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Cors" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Cryptography.Internal" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.DataProtection" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.DataProtection.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Extensions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Features" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.WebUtilities" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net461" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net461" />
-  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Binder" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="3.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileProviders.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Hosting.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Http" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.ObjectPool" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Primitives" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.WebEncoders" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Logging" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Protocols" version="5.2.1" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.2.1" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net461" />
-  <package id="Microsoft.Net.Http.Headers" version="2.1.0" targetFramework="net461" />
-  <package id="Microsoft.Owin" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Host.SystemWeb" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Security" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Security.Cookies" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Security.Facebook" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Security.Google" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Security.MicrosoftAccount" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Security.OAuth" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Security.Twitter" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
-  <package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
-  <package id="Modernizr" version="2.8.3" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
-  <package id="OpenActive.DatasetSite.NET" version="6.0.2" targetFramework="net461" />
-  <package id="OpenActive.NET" version="15.2.17" targetFramework="net461" />
-  <package id="Owin" version="1.0" targetFramework="net461" />
-  <package id="Schema.NET" version="7.0.1" targetFramework="net461" />
-  <package id="ServiceStack.Common" version="5.10.4" targetFramework="net461" />
-  <package id="ServiceStack.Common.Core" version="5.11.0" targetFramework="net461" />
-  <package id="ServiceStack.Interfaces" version="5.10.4" targetFramework="net461" />
-  <package id="ServiceStack.Interfaces.Core" version="5.11.0" targetFramework="net461" />
-  <package id="ServiceStack.OrmLite" version="5.10.4" targetFramework="net461" />
-  <package id="ServiceStack.OrmLite.Core" version="5.11.0" targetFramework="net461" />
-  <package id="ServiceStack.OrmLite.Sqlite.Core" version="5.11.0" targetFramework="net461" />
-  <package id="ServiceStack.Text" version="5.10.4" targetFramework="net461" />
-  <package id="ServiceStack.Text.Core" version="5.11.0" targetFramework="net461" />
-  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net461" />
-  <package id="Stubble.Core" version="1.9.3" targetFramework="net461" />
-  <package id="Stubble.Extensions.JsonNet" version="1.2.3" targetFramework="net461" />
-  <package id="Stubble.Extensions.JsonNet.Net45" version="1.3.3" targetFramework="net461" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
-  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
-  <package id="System.Collections.NonGeneric" version="4.3.0" targetFramework="net461" />
-  <package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net461" />
-  <package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net461" />
-  <package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
-  <package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net461" />
-  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net461" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.4" targetFramework="net461" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
-  <package id="System.Net.NetworkInformation" version="4.3.0" targetFramework="net461" />
-  <package id="System.Net.Requests" version="4.3.0" targetFramework="net461" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
-  <package id="System.Reflection.Emit" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net461" />
-  <package id="System.Reflection.TypeExtensions" version="4.5.0" targetFramework="net461" />
-  <package id="System.Runtime" version="4.3.1" targetFramework="net461" requireReinstallation="true" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
-  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
-  <package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Cng" version="4.5.0" targetFramework="net461" requireReinstallation="true" />
-  <package id="System.Security.Cryptography.Xml" version="4.5.0" targetFramework="net461" />
-  <package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
-  <package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net461" />
-  <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
-  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
-  <package id="UriTemplate.Core" version="1.0.2" targetFramework="net461" />
-  <package id="WebGrease" version="1.6.0" targetFramework="net461" />
+	<package id="Antlr" version="3.5.0.2" targetFramework="net461" />
+	<package id="Bogus" version="33.0.2" targetFramework="net461" />
+	<package id="bootstrap" version="3.4.1" targetFramework="net461" />
+	<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+	<package id="IdentityModel" version="3.10.10" targetFramework="net461" />
+	<package id="IdentityServer4" version="2.5.3" targetFramework="net461" />
+	<package id="IdentityServer4.Storage" version="2.5.3" targetFramework="net461" />
+	<package id="jQuery" version="3.3.1" targetFramework="net461" />
+	<package id="jQuery.Validation" version="1.17.0" targetFramework="net461" />
+	<package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
+	<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.2" targetFramework="net461" />
+	<package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net461" />
+	<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net461" />
+	<package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Authentication" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Authentication.Cookies" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Authentication.Core" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Authentication.OAuth" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Authorization" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Cors" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Cryptography.Internal" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.DataProtection" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.DataProtection.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Http" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Http.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Http.Extensions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.Http.Features" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.AspNetCore.WebUtilities" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net461" />
+	<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net461" />
+	<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Caching.Memory" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Configuration" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Configuration.Binder" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.DependencyInjection" version="3.0.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.0.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.FileProviders.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Hosting.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Http" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Logging" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.ObjectPool" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Options" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.Primitives" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Extensions.WebEncoders" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.IdentityModel.JsonWebTokens" version="5.2.4" targetFramework="net461" />
+	<package id="Microsoft.IdentityModel.Logging" version="5.2.4" targetFramework="net461" />
+	<package id="Microsoft.IdentityModel.Protocols" version="5.2.1" targetFramework="net461" />
+	<package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.2.1" targetFramework="net461" />
+	<package id="Microsoft.IdentityModel.Tokens" version="5.2.4" targetFramework="net461" />
+	<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net461" />
+	<package id="Microsoft.Net.Http.Headers" version="2.1.0" targetFramework="net461" />
+	<package id="Microsoft.Owin" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Owin.Host.SystemWeb" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Owin.Security" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Owin.Security.Cookies" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Owin.Security.Facebook" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Owin.Security.Google" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Owin.Security.MicrosoftAccount" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Owin.Security.OAuth" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Owin.Security.Twitter" version="4.0.0" targetFramework="net461" />
+	<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
+	<package id="Microsoft.Win32.Registry" version="4.5.0" targetFramework="net461" />
+	<package id="Modernizr" version="2.8.3" targetFramework="net461" />
+	<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
+	<package id="OpenActive.DatasetSite.NET" version="6.0.2" targetFramework="net461" />
+	<package id="OpenActive.NET" version="15.2.17" targetFramework="net461" />
+	<package id="Owin" version="1.0" targetFramework="net461" />
+	<package id="Schema.NET" version="7.0.1" targetFramework="net461" />
+	<package id="ServiceStack.Common" version="5.11.0" targetFramework="net461" />
+	<package id="ServiceStack.Common.Core" version="5.11.0" targetFramework="net461" />
+	<package id="ServiceStack.Interfaces" version="5.11.0" targetFramework="net461" />
+	<package id="ServiceStack.Interfaces.Core" version="5.11.0" targetFramework="net461" />
+	<package id="ServiceStack.OrmLite" version="5.11.0" targetFramework="net461" />
+	<package id="ServiceStack.OrmLite.Core" version="5.11.0" targetFramework="net461" />
+	<package id="ServiceStack.OrmLite.Sqlite.Core" version="5.11.0" targetFramework="net461" />
+	<package id="ServiceStack.Text" version="5.11.0" targetFramework="net461" />
+	<package id="ServiceStack.Text.Core" version="5.11.0" targetFramework="net461" />
+	<package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net461" />
+	<package id="Stubble.Core" version="1.9.3" targetFramework="net461" />
+	<package id="Stubble.Extensions.JsonNet" version="1.2.3" targetFramework="net461" />
+	<package id="Stubble.Extensions.JsonNet.Net45" version="1.3.3" targetFramework="net461" />
+	<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
+	<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
+	<package id="System.Collections.NonGeneric" version="4.3.0" targetFramework="net461" />
+	<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net461" />
+	<package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net461" />
+	<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
+	<package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net461" />
+	<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net461" />
+	<package id="System.IdentityModel.Tokens.Jwt" version="5.2.4" targetFramework="net461" />
+	<package id="System.Memory" version="4.5.4" targetFramework="net461" />
+	<package id="System.Net.NetworkInformation" version="4.3.0" targetFramework="net461" />
+	<package id="System.Net.Requests" version="4.3.0" targetFramework="net461" />
+	<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
+	<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net461" />
+	<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net461" />
+	<package id="System.Reflection.TypeExtensions" version="4.5.0" targetFramework="net461" />
+	<package id="System.Runtime" version="4.3.1" targetFramework="net461" requireReinstallation="true" />
+	<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
+	<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
+	<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
+	<package id="System.Security.Cryptography.Cng" version="4.5.0" targetFramework="net461" requireReinstallation="true" />
+	<package id="System.Security.Cryptography.Xml" version="4.5.0" targetFramework="net461" />
+	<package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
+	<package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net461" />
+	<package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
+	<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
+	<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
+	<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
+	<package id="UriTemplate.Core" version="1.0.2" targetFramework="net461" />
+	<package id="WebGrease" version="1.6.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Fakes/OpenActive.FakeDatabase.NET.Tests/FakeBookingSystemTest.cs b/Fakes/OpenActive.FakeDatabase.NET.Tests/FakeBookingSystemTest.cs
index 016ee482..e24234c2 100644
--- a/Fakes/OpenActive.FakeDatabase.NET.Tests/FakeBookingSystemTest.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET.Tests/FakeBookingSystemTest.cs
@@ -19,7 +19,7 @@ public FakeBookingSystemTest(ITestOutputHelper output)
         [Fact]
         public void FakeDatabase_Exists()
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var q = db.From<ClassTable>()
                             .Join<OccurrenceTable>();
@@ -53,7 +53,7 @@ public void Transaction_Effective()
         {
             var testSeller = new SellerTable() { Name = "Test" };
 
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
                 {
@@ -77,7 +77,7 @@ public void Transaction_Effective()
         [Fact]
         public void ReadWrite_DateTime()
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var now = DateTime.Now; // Note date must be stored as local time, not UTC
                 var testOccurrence = new OccurrenceTable() { Start = now, ClassId = 1 };
@@ -93,7 +93,7 @@ public void ReadWrite_DateTime()
         [Fact]
         public void ReadWrite_Enum()
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var status = BookingStatus.CustomerCancelled;
                 var testOrderItem = new OrderItemsTable() { Status = status };
@@ -109,7 +109,7 @@ public void ReadWrite_Enum()
         [Fact]
         public void ReadWrite_OrderWithPrice()
         {
-            using (var db = FakeBookingSystem.Database.Mem.Database.Open())
+            using (var db = FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.Open())
             {
                 var uuid = new Guid("8265ab72-d458-40aa-a460-a9619e13192c");
                 decimal price = 1.3M;
diff --git a/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs b/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs
index 120a2482..26e09e56 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs
@@ -24,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().Result;
+        public static FakeDatabase FakeDatabase { get; } = FakeDatabase.GetPrepopulatedFakeDatabase().Result;
 
         public static void Initialise()
         {
@@ -74,11 +74,15 @@ public static string Sha256(this string input)
         }
     }
 
-    // ReSharper disable once InconsistentNaming
-    public class InMemorySQLite
+
+    public abstract class DatabaseWrapper
     {
-        public readonly OrmLiteConnectionFactory Database;
+        public OrmLiteConnectionFactory Database { get; set; }
+    }
 
+    // ReSharper disable once InconsistentNaming
+    public class InMemorySQLite : DatabaseWrapper
+    {
         public InMemorySQLite()
         {
             // ServiceStack registers a memory cache client by default <see href="https://docs.servicestack.net/caching">https://docs.servicestack.net/caching</see>
@@ -98,12 +102,31 @@ public InMemorySQLite()
             }
 
             // Create empty tables
-            DatabaseCreator.CreateTables(Database);
+            // For in-memory database, data must be generated on every restart
+            DatabaseCreator.CreateTables(Database, true);
 
             // OrmLiteUtils.PrintSql();
         }
     }
 
+    public class RemoteSqlServer : DatabaseWrapper
+    {
+        public RemoteSqlServer()
+        {
+            var connectionString = Environment.GetEnvironmentVariable("REMOTE_STORAGE_CONNECTION_STRING");
+            if (connectionString == null)
+            {
+                throw new Exception("Environment variable 'REMOTE_STORAGE_CONNECTION_STRING' is not set when 'USE_REMOTE_STORAGE' is true");
+            }
+            Database = new OrmLiteConnectionFactory(connectionString, SqlServerDialect.Provider);
+
+            // Create empty tables
+            var dropTablesOnRestart = bool.TryParse(Environment.GetEnvironmentVariable("DROP_TABLES_ON_RESTART"), out var dropTablesEnvVar) ? dropTablesEnvVar : true;
+            DatabaseCreator.CreateTables(Database, dropTablesOnRestart);
+        }
+
+    }
+
     /// <summary>
     /// Result of deleting (or attempting to delete) an Order in a FakeDatabase
     /// </summary>
@@ -166,7 +189,7 @@ public class FakeDatabase
         private const float ProportionWithRequiresAttendeeValidation = 1f / 10;
         private const float ProportionWithRequiresAdditionalDetails = 1f / 10;
 
-        public readonly InMemorySQLite Mem = new InMemorySQLite();
+        public readonly DatabaseWrapper DatabaseWrapper;
 
         private static readonly Faker Faker = new Faker();
 
@@ -175,15 +198,92 @@ static FakeDatabase()
             Randomizer.Seed = new Random((int)(DateTime.Today - new DateTime(1970, 1, 1)).TotalDays);
         }
 
-        private static readonly int OpportunityCount =
-            int.TryParse(Environment.GetEnvironmentVariable("OPPORTUNITY_COUNT"), out var opportunityCount) ? opportunityCount : 2000;
+        public FakeDatabase()
+        {
+            var useRemoteStorage = bool.TryParse(Environment.GetEnvironmentVariable("USE_REMOTE_STORAGE"), out var remoteStorageEnvVar) ? remoteStorageEnvVar : false;
+            if (useRemoteStorage)
+            {
+                DatabaseWrapper = new RemoteSqlServer();
+            }
+            else
+            {
+                DatabaseWrapper = new InMemorySQLite();
+            }
+        }
+
+        public async Task SoftDeletedPastOpportunitiesAndInsertNewAtEdgeOfWindow()
+        {
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
+            {
+                // Get Occurrences to be soft deleted
+                var toBeSoftDeletedOccurrences = await db.SelectAsync<OccurrenceTable>(x => x.Deleted != true && x.Start < DateTime.Now);
+                // Create new copy of occurrences where date is at edge of window (ie 15 days in the future), reset the uses, and insert
+                var occurrencesAtEdgeOfWindow = toBeSoftDeletedOccurrences.Select(x => new OccurrenceTable
+                {
+                    TestDatasetIdentifier = x.TestDatasetIdentifier,
+                    ClassTable = x.ClassTable,
+                    ClassId = x.ClassId,
+                    Start = x.Start.AddDays(15),
+                    End = x.End.AddDays(15),
+                    RemainingSpaces = x.TotalSpaces,
+                    LeasedSpaces = 0,
+                    TotalSpaces = x.TotalSpaces,
+                }
+                ).ToList();
+                await db.InsertAllAsync(occurrencesAtEdgeOfWindow);
+
+                // Mark old occurrences as soft deleted and update
+                var softDeletedOccurrences = toBeSoftDeletedOccurrences.Select(x => { x.Deleted = true; return x; });
+                await db.UpdateAllAsync(softDeletedOccurrences);
+
+                // Get Slots to be soft deleted
+                var toBeSoftDeletedSlots = await db.SelectAsync<SlotTable>(x => x.Deleted != true && x.Start < DateTime.Now);
+                // Create new copy of slots where date is at edge of window (ie 15 days in the future), reset the uses, and insert
+                var slotsAtEdgeOfWindow = toBeSoftDeletedSlots.Select(x => new SlotTable
+                {
+                    TestDatasetIdentifier = x.TestDatasetIdentifier,
+                    FacilityUseId = x.FacilityUseId,
+                    FacilityUseTable = x.FacilityUseTable,
+                    Start = x.Start.AddDays(15),
+                    End = x.End.AddDays(15),
+                    RemainingUses = x.MaximumUses,
+                    LeasedUses = 0,
+                    MaximumUses = x.MaximumUses,
+                    Price = x.Price,
+                    AllowCustomerCancellationFullRefund = x.AllowCustomerCancellationFullRefund,
+                    Prepayment = x.Prepayment,
+                    RequiresAttendeeValidation = x.RequiresAttendeeValidation,
+                    RequiresApproval = x.RequiresApproval,
+                    RequiresAdditionalDetails = x.RequiresAdditionalDetails,
+                    RequiredAdditionalDetails = x.RequiredAdditionalDetails,
+                    ValidFromBeforeStartDate = x.ValidFromBeforeStartDate,
+                    LatestCancellationBeforeStartDate = x.LatestCancellationBeforeStartDate,
+                    AllowsProposalAmendment = x.AllowsProposalAmendment,
+                }
+                ).ToList();
+                await db.InsertAllAsync(slotsAtEdgeOfWindow);
+
+                // Mark old slots as soft deleted and update
+                var softDeletedSlots = toBeSoftDeletedSlots.Select(x => { x.Deleted = true; return x; });
+                await db.UpdateAllAsync(softDeletedSlots);
+            }
+        }
+
+        public async Task HardDeletedOldSoftDeletedOccurrencesAndSlots()
+        {
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
+            {
+                await db.DeleteAsync<OccurrenceTable>(x => x.Deleted == true && x.Modified < new DateTimeOffset(DateTime.Today.AddDays(-1)).UtcTicks);
+                await db.DeleteAsync<SlotTable>(x => x.Deleted == true && x.Modified < new DateTimeOffset(DateTime.Today.AddDays(-1)).UtcTicks);
+            }
+        }
 
         /// <summary>
         /// TODO: Call this on a schedule from both .NET Core and .NET Framework reference implementations
         /// </summary>
         public async Task CleanupExpiredLeases()
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var occurrenceIds = new List<long>();
                 var slotIds = new List<long>();
@@ -257,7 +357,7 @@ await db.InsertAsync(new OrderTable
         /// <returns></returns>
         public async Task<bool> UpdateFacilityUseName(long slotId, string newName)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<SlotTable>()
                               .LeftJoin<SlotTable, FacilityUseTable>()
@@ -282,7 +382,7 @@ public async Task<bool> UpdateFacilityUseName(long slotId, string newName)
         /// <returns></returns>
         public async Task<bool> UpdateFacilitySlotStartAndEndTimeByPeriodInMins(long slotId, int numberOfMins)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var slot = await db.SingleAsync<SlotTable>(x => x.Id == slotId && !x.Deleted);
                 if (slot == null)
@@ -305,7 +405,7 @@ public async Task<bool> UpdateFacilitySlotStartAndEndTimeByPeriodInMins(long slo
         /// <returns></returns>
         public async Task<bool> UpdateFacilityUseLocationLatLng(long slotId, decimal newLat, decimal newLng)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<SlotTable>()
                               .LeftJoin<SlotTable, FacilityUseTable>()
@@ -331,7 +431,7 @@ public async Task<bool> UpdateFacilityUseLocationLatLng(long slotId, decimal new
         /// <returns></returns>
         public async Task<bool> UpdateClassTitle(long occurrenceId, string newTitle)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<OccurrenceTable>()
                             .LeftJoin<OccurrenceTable, ClassTable>()
@@ -356,7 +456,7 @@ public async Task<bool> UpdateClassTitle(long occurrenceId, string newTitle)
         /// <returns></returns>
         public async Task<bool> UpdateScheduledSessionStartAndEndTimeByPeriodInMins(long occurrenceId, int numberOfMins)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var occurrence = await db.SingleAsync<OccurrenceTable>(x => x.Id == occurrenceId && !x.Deleted);
                 if (occurrence == null)
@@ -379,7 +479,7 @@ public async Task<bool> UpdateScheduledSessionStartAndEndTimeByPeriodInMins(long
         /// <returns></returns>
         public async Task<bool> UpdateSessionSeriesLocationLatLng(long occurrenceId, decimal newLat, decimal newLng)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<OccurrenceTable>()
                             .LeftJoin<OccurrenceTable, ClassTable>()
@@ -402,7 +502,7 @@ public async Task<bool> UpdateAccess(Guid uuid, bool updateAccessPass = false, b
             if (!updateAccessPass && !updateAccessCode && !updateAccessChannel)
                 return false;
 
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 OrderTable order = await db.SingleAsync<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
 
@@ -450,7 +550,7 @@ public async Task<bool> UpdateAccess(Guid uuid, bool updateAccessPass = false, b
 
         public async Task<bool> UpdateOpportunityAttendance(Guid uuid, bool attended)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 OrderTable order = await db.SingleAsync<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
 
@@ -481,7 +581,7 @@ public async Task<bool> UpdateOpportunityAttendance(Guid uuid, bool attended)
 
         public async Task<bool> AddCustomerNotice(Guid uuid)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 OrderTable order = await db.SingleAsync<OrderTable>(x => x.OrderId == uuid.ToString() && !x.Deleted);
                 if (order != null)
@@ -510,7 +610,7 @@ public async Task<bool> AddCustomerNotice(Guid uuid)
 
         public async Task DeleteBookingPartner(string clientId)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 await db.DeleteAsync<BookingPartnerTable>(x => x.ClientId == clientId);
             }
@@ -518,7 +618,7 @@ public async Task DeleteBookingPartner(string clientId)
 
         public async Task DeleteLease(string clientId, Guid uuid, long? sellerId)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 // TODO: Note this should throw an error if the Seller ID does not match, same as DeleteOrder
                 if (await db.ExistsAsync<OrderTable>(x => x.ClientId == clientId && x.OrderMode == OrderMode.Lease && x.OrderId == uuid.ToString() && (!sellerId.HasValue || x.SellerId == sellerId)))
@@ -611,7 +711,7 @@ await db.InsertAsync(new OrderTable
 
         public async Task<(FakeDatabaseGetOrderResult, OrderTable, List<OrderItemsTable>)> GetOrderAndOrderItems(string clientId, long? sellerId, Guid uuid)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.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);
@@ -624,7 +724,7 @@ await db.InsertAsync(new OrderTable
 
         public async Task<(bool, ClassTable, OccurrenceTable, BookedOrderItemInfo)> GetOccurrenceAndBookedOrderItemInfoByOccurrenceId(Guid uuid, long? occurrenceId)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<OccurrenceTable>()
                     .LeftJoin<OccurrenceTable, ClassTable>()
@@ -660,7 +760,7 @@ await db.InsertAsync(new OrderTable
 
         public async Task<(bool, FacilityUseTable, SlotTable, BookedOrderItemInfo)> GetSlotAndBookedOrderItemInfoBySlotId(Guid uuid, long? slotId)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<SlotTable>()
                     .LeftJoin<SlotTable, FacilityUseTable>()
@@ -692,7 +792,7 @@ await db.InsertAsync(new OrderTable
 
         public async Task<FakeDatabaseDeleteOrderResult> DeleteOrder(string clientId, Guid uuid, long? sellerId)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 // Set the Order to deleted in the feed, and erase all associated personal data
                 var order = await db.SingleAsync<OrderTable>(x => x.ClientId == clientId && x.OrderId == uuid.ToString() && x.OrderMode != OrderMode.Lease);
@@ -981,7 +1081,7 @@ List<string> additionalDetailsString
 
         public async Task<bool> CancelOrderItems(string clientId, long? sellerId, Guid uuid, List<long> orderItemIds, bool customerCancelled, bool includeCancellationMessage = false)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
             {
                 var order = customerCancelled
@@ -1091,7 +1191,7 @@ public async Task<bool> CancelOrderItems(string clientId, long? sellerId, Guid u
 
         public async Task<bool> ReplaceOrderOpportunity(Guid uuid)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<OrderItemsTable>()
                               .Join<OrderTable>()
@@ -1168,7 +1268,7 @@ public async Task<bool> ReplaceOrderOpportunity(Guid uuid)
 
         public async Task<bool> AcceptOrderProposal(Guid uuid)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var order = await db.SingleAsync<OrderTable>(x => x.OrderMode == OrderMode.Proposal && x.OrderId == uuid.ToString() && !x.Deleted);
                 if (order != null)
@@ -1190,7 +1290,7 @@ public async Task<bool> AcceptOrderProposal(Guid uuid)
         }
         public async Task<bool> AmendOrderProposal(Guid uuid, Guid version)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var order = await db.SingleAsync<OrderTable>(x => x.OrderMode == OrderMode.Proposal && x.OrderId == uuid.ToString() && !x.Deleted);
                 if (order != null)
@@ -1213,7 +1313,7 @@ public async Task<bool> AmendOrderProposal(Guid uuid, Guid version)
 
         public async Task<FakeDatabaseBookOrderProposalResult> BookOrderProposal(string clientId, long? sellerId, Guid uuid, Guid? proposalVersionUuid)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 // Note call is idempotent, so it might already be in the booked state
                 var order = await db.SingleAsync<OrderTable>(x => x.ClientId == clientId && (x.OrderMode == OrderMode.Proposal || x.OrderMode == OrderMode.Booking) && x.OrderId == uuid.ToString() && !x.Deleted);
@@ -1263,31 +1363,47 @@ public async Task<FakeDatabaseBookOrderProposalResult> BookOrderProposal(string
 
         public async Task<long> GetNumberOfOtherLeaseForOccurrence(Guid uuid, long? occurrenceId)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
-                return db.Count<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking &&
-                                                 x.OrderTable.ProposalStatus != ProposalStatus.CustomerRejected &&
-                                                 x.OrderTable.ProposalStatus != ProposalStatus.SellerRejected &&
-                                                 x.OccurrenceId == occurrenceId &&
-                                                 x.OrderId != uuid.ToString());
+                var q = db.From<OrderItemsTable>().Join<OrderTable>((orderItem, order) =>
+                orderItem.OrderId == order.OrderId &&
+                order.OrderMode != OrderMode.Booking &&
+                order.ProposalStatus != ProposalStatus.CustomerRejected &&
+                order.ProposalStatus != ProposalStatus.SellerRejected &&
+                orderItem.OccurrenceId == occurrenceId &&
+                orderItem.OrderId != uuid.ToString());
+                return db.Count(q);
             }
         }
 
         public async Task<long> GetNumberOfOtherLeasesForSlot(Guid uuid, long? slotId)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
-                return db.Count<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking &&
+                var q = db.From<OrderItemsTable>().Join<OrderTable>((orderItem, order) =>
+                    orderItem.OrderId == order.OrderId &&
+                    order.OrderMode != OrderMode.Booking &&
+                    order.ProposalStatus != ProposalStatus.CustomerRejected &&
+                    order.ProposalStatus != ProposalStatus.SellerRejected &&
+                    orderItem.SlotId == slotId &&
+                    orderItem.OrderId != uuid.ToString()
+                );
+                var a = db.SelectAsync(q);
+
+                //return db.Count(q);
+
+                var b = await db.LoadSelectAsync<OrderItemsTable>(x => x.OrderTable.OrderMode != OrderMode.Booking &&
                                                  x.OrderTable.ProposalStatus != ProposalStatus.CustomerRejected &&
                                                  x.OrderTable.ProposalStatus != ProposalStatus.SellerRejected &&
                                                  x.SlotId == slotId &&
                                                  x.OrderId != uuid.ToString());
+                return b.Count;
             }
         }
 
         public async Task<bool> RejectOrderProposal(string clientId, long? sellerId, Guid uuid, bool customerRejected)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 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)
@@ -1322,11 +1438,19 @@ public static async Task RecalculateSlotUses(IDbConnection db, SlotTable slot)
                 return;
 
             // Update number of leased spaces remaining for the opportunity
-            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;
+            var leasedUsesQuery = db.From<OrderItemsTable>().Join<OrderTable>((x, y) => x.OrderId == y.OrderId)
+                    .Where<OrderTable>(x => x.OrderMode != OrderMode.Booking &&
+                                                x.ProposalStatus != ProposalStatus.CustomerRejected &&
+                                                x.ProposalStatus != ProposalStatus.SellerRejected)
+                        .And<OrderItemsTable>(x => x.SlotId == slot.Id);
+            var leasedUses = await db.CountAsync(leasedUsesQuery);
             slot.LeasedUses = leasedUses;
 
             // Update number of actual spaces remaining for the opportunity
-            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;
+            var totalUsesTakenQuery = db.From<OrderItemsTable>().Join<OrderTable>((x, y) => x.OrderId == y.OrderId)
+                .Where<OrderTable>(x => x.OrderMode == OrderMode.Booking)
+                .And<OrderItemsTable>(x => x.SlotId == slot.Id && (x.Status == BookingStatus.Confirmed || x.Status == BookingStatus.Attended || x.Status == BookingStatus.Absent));
+            var totalUsesTaken = await db.CountAsync(totalUsesTakenQuery);
             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)
@@ -1350,11 +1474,23 @@ public static async Task RecalculateSpaces(IDbConnection db, OccurrenceTable occ
                 return;
 
             // Update number of leased spaces remaining for the opportunity
-            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;
+            var leasedUsesQuery = db.From<OrderItemsTable>().Join<OrderTable>((orderItem, order) =>
+                orderItem.OrderId == order.OrderId &&
+                order.OrderMode != OrderMode.Booking &&
+                order.ProposalStatus != ProposalStatus.CustomerRejected &&
+                order.ProposalStatus != ProposalStatus.SellerRejected &&
+                orderItem.OccurrenceId == occurrence.Id);
+
+            var leasedSpaces = await db.CountAsync(leasedUsesQuery);
             occurrence.LeasedSpaces = leasedSpaces;
 
             // Update number of actual spaces remaining for the opportunity
-            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();
+            var totalUsesTakenQuery = db.From<OrderItemsTable>().Join<OrderTable>((orderItem, order) =>
+            orderItem.OrderId == order.OrderId &&
+            order.OrderMode == OrderMode.Booking &&
+            orderItem.OccurrenceId == occurrence.Id
+            && (orderItem.Status == BookingStatus.Confirmed || orderItem.Status == BookingStatus.Attended || orderItem.Status == BookingStatus.Absent));
+            var totalSpacesTaken = await db.CountAsync(totalUsesTakenQuery);
             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!
@@ -1373,27 +1509,32 @@ public static async Task RecalculateSpaces(IDbConnection db, IEnumerable<long> o
 
         public static async Task<FakeDatabase> GetPrepopulatedFakeDatabase()
         {
-            var database = new FakeDatabase();
-            using (var db = await database.Mem.Database.OpenAsync())
-            using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
+            var fakeDatabase = new FakeDatabase();
+            var useRemoteStorage = bool.TryParse(Environment.GetEnvironmentVariable("USE_REMOTE_STORAGE"), out var remoteStorageEnvVar) ? remoteStorageEnvVar : false;
+            var dropTablesOnRestart = bool.TryParse(Environment.GetEnvironmentVariable("DROP_TABLES_ON_RESTART"), out var dropTablesEnvVar) ? dropTablesEnvVar : true;
+            var opportunityCount =
+            int.TryParse(Environment.GetEnvironmentVariable("OPPORTUNITY_COUNT"), out var opportunityCountEnvVar) ? opportunityCountEnvVar : 2000;
+            if (!useRemoteStorage || dropTablesOnRestart)
             {
-
-                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();
+                using (var db = await fakeDatabase.DatabaseWrapper.Database.OpenAsync())
+                using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
+                {
+                    await CreateSellers(db);
+                    await CreateSellerUsers(db);
+                    await CreateFakeClasses(db, opportunityCount);
+                    await CreateFakeFacilitiesAndSlots(db, opportunityCount);
+                    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;
+            return fakeDatabase;
         }
 
-        private static async Task CreateFakeFacilitiesAndSlots(IDbConnection db)
+        private static async Task CreateFakeFacilitiesAndSlots(IDbConnection db, int opportunityCount)
         {
-            var opportunitySeeds = GenerateOpportunitySeedDistribution(OpportunityCount);
+            var opportunitySeeds = GenerateOpportunitySeedDistribution(opportunityCount);
 
             var facilities = opportunitySeeds
                 .Select(seed => new FacilityUseTable
@@ -1446,9 +1587,9 @@ private static async Task CreateFakeFacilitiesAndSlots(IDbConnection db)
             await db.InsertAllAsync(slots);
         }
 
-        public static async Task CreateFakeClasses(IDbConnection db)
+        public static async Task CreateFakeClasses(IDbConnection db, int opportunityCount)
         {
-            var opportunitySeeds = GenerateOpportunitySeedDistribution(OpportunityCount);
+            var opportunitySeeds = GenerateOpportunitySeedDistribution(opportunityCount);
 
             var classes = opportunitySeeds
                 .Select(seed => new
@@ -1615,9 +1756,9 @@ public static async Task CreateGrants(IDbConnection db)
         {
             var grants = new List<GrantTable>
             {
-                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" },
+                new GrantTable { ClientId = "clientid_XXX", SubjectId = "100", Type = "user_consent", CreationTime = DateTime.Now, Key = Faker.Random.String2(25) },
+                new GrantTable { ClientId = "clientid_YYY", SubjectId = "100", Type = "user_consent", CreationTime = DateTime.Now, Key = Faker.Random.String2(25) },
+                new GrantTable { ClientId = "clientid_ZZZ", SubjectId = "100", Type = "user_consent", CreationTime = DateTime.Now, Key = Faker.Random.String2(25) },
             };
 
             await db.InsertAllAsync(grants);
@@ -1640,7 +1781,7 @@ public static async Task CreateSellerUsers(IDbConnection db)
 
         public async Task<bool> ValidateSellerUserCredentials(string username, string password)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var matchingUser = await db.SingleAsync<SellerUserTable>(x => x.Username == username && x.PasswordHash == password.Sha256());
                 return matchingUser != null;
@@ -1649,7 +1790,7 @@ public async Task<bool> ValidateSellerUserCredentials(string username, string pa
 
         public async Task<SellerUserTable> GetSellerUser(string username)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 return await db.SingleAsync<SellerUserTable>(x => x.Username == username);
             }
@@ -1657,7 +1798,7 @@ public async Task<SellerUserTable> GetSellerUser(string username)
 
         public async Task<SellerUserTable> GetSellerUserById(long sellerUserId)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 return await db.LoadSingleByIdAsync<SellerUserTable>(sellerUserId);
             }
@@ -1665,14 +1806,14 @@ public async Task<SellerUserTable> GetSellerUserById(long sellerUserId)
 
         public async Task<GrantTable> GetGrant(string key)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 return await db.SingleAsync<GrantTable>(x => x.Key == key);
             }
         }
         public async Task<List<GrantTable>> GetAllGrants(string subjectId, string sessionId, string clientId, string type)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<GrantTable>();
                 if (!String.IsNullOrWhiteSpace(clientId))
@@ -1698,7 +1839,7 @@ public async Task<List<GrantTable>> GetAllGrants(string subjectId, string sessio
 
         public async Task<bool> AddGrant(string key, string type, string subjectId, string sessionId, string clientId, DateTime creationTime, DateTime? consumedTime, DateTime? expiration, string data)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var grant = new GrantTable
                 {
@@ -1718,7 +1859,7 @@ public async Task<bool> AddGrant(string key, string type, string subjectId, stri
 
         public async Task RemoveGrant(string key)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 await db.DeleteAsync<GrantTable>(x => x.Key == key);
             }
@@ -1726,7 +1867,7 @@ public async Task RemoveGrant(string key)
 
         public async Task RemoveAllGrants(string subjectId, string sessionId, string clientId, string type)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<GrantTable>();
                 if (!String.IsNullOrWhiteSpace(clientId))
@@ -1745,11 +1886,18 @@ public async Task RemoveAllGrants(string subjectId, string sessionId, string cli
                 {
                     query = query.Where(x => x.Type == type);
                 }
-
                 await db.DeleteAsync(query);
             }
         }
 
+        public async Task RemoveGrant(string subjectId, string clientId, string type)
+        {
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
+            {
+                await db.DeleteAsync<GrantTable>(x => x.SubjectId == subjectId && x.ClientId == clientId && x.Type == type);
+            }
+        }
+
         public async Task<(int, int)> AddClass(
             string testDatasetIdentifier,
             long? sellerId,
@@ -1773,7 +1921,7 @@ public async Task RemoveAllGrants(string subjectId, string sessionId, string cli
             var startTime = DateTime.Now.AddDays(inPast ? -1 : 1);
             var endTime = DateTime.Now.AddDays(inPast ? -1 : 1).AddHours(1);
 
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
             {
                 var @class = new ClassTable
@@ -1843,7 +1991,7 @@ public async Task RemoveAllGrants(string subjectId, string sessionId, string cli
             var startTime = DateTime.Now.AddDays(inPast ? -1 : 1);
             var endTime = DateTime.Now.AddDays(inPast ? -1 : 1).AddHours(1);
 
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             using (var transaction = db.OpenTransaction(IsolationLevel.Serializable))
             {
                 var facility = new FacilityUseTable
@@ -1893,7 +2041,7 @@ public async Task RemoveAllGrants(string subjectId, string sessionId, string cli
 
         public async Task DeleteTestClassesFromDataset(string testDatasetIdentifier)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 await db.UpdateOnlyAsync(() => new ClassTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
                     where: x => x.TestDatasetIdentifier == testDatasetIdentifier && !x.Deleted);
@@ -1905,7 +2053,7 @@ public async Task DeleteTestClassesFromDataset(string testDatasetIdentifier)
 
         public async Task DeleteTestFacilitiesFromDataset(string testDatasetIdentifier)
         {
-            using (var db = await Mem.Database.OpenAsync())
+            using (var db = await DatabaseWrapper.Database.OpenAsync())
             {
                 await db.UpdateOnlyAsync(() => new FacilityUseTable { Modified = DateTimeOffset.Now.UtcTicks, Deleted = true },
                     where: x => x.TestDatasetIdentifier == testDatasetIdentifier && !x.Deleted);
diff --git a/Fakes/OpenActive.FakeDatabase.NET/FakeDatabaseTransaction.cs b/Fakes/OpenActive.FakeDatabase.NET/FakeDatabaseTransaction.cs
index fff6c808..39eb76c8 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/FakeDatabaseTransaction.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/FakeDatabaseTransaction.cs
@@ -11,7 +11,7 @@ public class FakeDatabaseTransaction : IDisposable
 
         public FakeDatabaseTransaction(FakeDatabase database)
         {
-            DatabaseConnection = database.Mem.Database.Open();
+            DatabaseConnection = database.DatabaseWrapper.Database.Open();
             transaction = DatabaseConnection.OpenTransaction(IsolationLevel.Serializable);
         }
         
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/BookingPartnerTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/BookingPartnerTable.cs
index 007791e9..9eb66475 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/Models/BookingPartnerTable.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/BookingPartnerTable.cs
@@ -73,7 +73,7 @@ public static async Task Create(IDbConnection db)
 
         public static async Task<List<BookingPartnerTable>> Get()
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 return await db.SelectAsync<BookingPartnerTable>();
             }
@@ -81,7 +81,7 @@ public static async Task<List<BookingPartnerTable>> Get()
 
         public static async Task<List<BookingPartnerTable>> GetBySellerUserId(long sellerUserId)
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 var query = db.From<BookingPartnerTable>()
                               .Join<BookingPartnerTable, GrantTable>((b, g) => b.ClientId == g.ClientId && g.Type == "user_consent")
@@ -93,7 +93,7 @@ public static async Task<List<BookingPartnerTable>> GetBySellerUserId(long selle
 
         public static async Task<BookingPartnerTable> GetByInitialAccessToken(string registrationKey)
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.InitialAccessToken == registrationKey);
                 return bookingPartner?.InitialAccessTokenKeyValidUntil > DateTime.Now ? bookingPartner : null;
@@ -102,7 +102,7 @@ public static async Task<BookingPartnerTable> GetByInitialAccessToken(string reg
 
         public static async Task<BookingPartnerTable> GetByClientId(string clientId)
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 return await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
             }
@@ -110,7 +110,7 @@ public static async Task<BookingPartnerTable> GetByClientId(string clientId)
 
         public static async Task Save(BookingPartnerTable bookingPartnerTable)
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 await db.SaveAsync(bookingPartnerTable);
             }
@@ -118,7 +118,7 @@ public static async Task Save(BookingPartnerTable bookingPartnerTable)
 
         public static async Task ResetCredentials(string clientId, string key)
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
                 bookingPartner.Registered = false;
@@ -131,7 +131,7 @@ public static async Task ResetCredentials(string clientId, string key)
 
         public static async Task SetKey(string clientId, string key)
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
                 bookingPartner.InitialAccessToken = key;
@@ -142,7 +142,7 @@ public static async Task SetKey(string clientId, string key)
 
         public static async Task UpdateScope(string clientId, string scope, bool bookingsSuspended)
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 var bookingPartner = await db.SingleAsync<BookingPartnerTable>(x => x.ClientId == clientId);
                 bookingPartner.Scope = scope;
@@ -153,7 +153,7 @@ public static async Task UpdateScope(string clientId, string scope, bool booking
 
         public static async Task Add(BookingPartnerTable newBookingPartner)
         {
-            using (var db = await FakeBookingSystem.Database.Mem.Database.OpenAsync())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 await db.SaveAsync(newBookingPartner);
             }
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/BookingStatistics.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/BookingStatistics.cs
index af61cb1a..e8961941 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/Models/BookingStatistics.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/BookingStatistics.cs
@@ -15,7 +15,7 @@ public class BookingStatistics
         // 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())
+            using (var db = await FakeBookingSystem.FakeDatabase.DatabaseWrapper.Database.OpenAsync())
             {
                 var thirtyDaysAgo = DateTimeOffset.Now.AddDays(-30);
                 var bookingsByBroker = (await db.SelectAsync<OrderTable>(o => o.ClientId == clientId && o.OrderCreated > thirtyDaysAgo))
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/DatabaseTables.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/DatabaseTables.cs
index 20630ff9..f26c28c9 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/Models/DatabaseTables.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/DatabaseTables.cs
@@ -32,30 +32,46 @@ public abstract class Table
 
     public static class DatabaseCreator
     {
-        public static void CreateTables(OrmLiteConnectionFactory dbFactory)
+        public static void CreateTables(OrmLiteConnectionFactory dbFactory, bool dropTablesOnRestart)
         {
             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>();
+                if (dropTablesOnRestart)
+                {
+                    db.DropTable<SellerUserTable>();
+                    db.DropTable<OrderItemsTable>();
+                    db.DropTable<OccurrenceTable>();
+                    db.DropTable<OrderTable>();
+                    db.DropTable<ClassTable>();
+                    db.DropTable<SlotTable>();
+                    db.DropTable<FacilityUseTable>();
+                    db.DropTable<GrantTable>();
+                    db.DropTable<BookingPartnerTable>();
+                    db.DropTable<SellerTable>();
+                    db.CreateTable<GrantTable>();
+                    db.CreateTable<BookingPartnerTable>();
+                    db.CreateTable<SellerTable>();
+                    db.CreateTable<ClassTable>();
+                    db.CreateTable<OrderTable>();
+                    db.CreateTable<OccurrenceTable>();
+                    db.CreateTable<FacilityUseTable>();
+                    db.CreateTable<SlotTable>();
+                    db.CreateTable<OrderItemsTable>();
+                    db.CreateTable<SellerUserTable>();
+                }
+                else
+                {
+                    db.CreateTableIfNotExists<GrantTable>();
+                    db.CreateTableIfNotExists<BookingPartnerTable>();
+                    db.CreateTableIfNotExists<SellerTable>();
+                    db.CreateTableIfNotExists<ClassTable>();
+                    db.CreateTableIfNotExists<OrderTable>();
+                    db.CreateTableIfNotExists<OccurrenceTable>();
+                    db.CreateTableIfNotExists<FacilityUseTable>();
+                    db.CreateTableIfNotExists<SlotTable>();
+                    db.CreateTableIfNotExists<OrderItemsTable>();
+                    db.CreateTableIfNotExists<SellerUserTable>();
+                }
             }
         }
     }
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/OrderItemsTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/OrderItemsTable.cs
index b6a72aa9..0a086917 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/Models/OrderItemsTable.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/OrderItemsTable.cs
@@ -14,11 +14,11 @@ public class OrderItemsTable : Table
         public string OrderId { get; set; }
         [Reference]
         public OccurrenceTable OccurrenceTable { get; set; }
-        [ForeignKey(typeof(OccurrenceTable), OnDelete = "CASCADE")]
+        [ForeignKey(typeof(OccurrenceTable), OnDelete = "NO ACTION")] // SQL Server seems to have a problem with chained cascading
         public long? OccurrenceId { get; set; }
         [Reference]
         public SlotTable SlotTable { get; set; }
-        [ForeignKey(typeof(SlotTable), OnDelete = "CASCADE")]
+        [ForeignKey(typeof(SlotTable), OnDelete = "NO ACTION")] // SQL Server seems to have a problem with chained cascading
         public long? SlotId { get; set; }
         public BookingStatus Status { get; set; }
         public string CancellationMessage { get; set; }
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/OrderTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/OrderTable.cs
index f83fd1a8..10cf517c 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/Models/OrderTable.cs
+++ b/Fakes/OpenActive.FakeDatabase.NET/Models/OrderTable.cs
@@ -41,7 +41,7 @@ public class OrderTable
         public string PaymentAccountId { get; set; }
         public decimal TotalOrderPrice { get; set; }
         public OrderMode OrderMode { get; set; }
-        public DateTime LeaseExpires { get; set; }
+        public DateTime? LeaseExpires { get; set; }
         public FeedVisibility VisibleInOrdersFeed { get; set; }
         public FeedVisibility VisibleInOrderProposalsFeed { get; set; }
         public ProposalStatus? ProposalStatus { get; set; }
diff --git a/Fakes/OpenActive.FakeDatabase.NET/OpenActive.FakeDatabase.NET.csproj b/Fakes/OpenActive.FakeDatabase.NET/OpenActive.FakeDatabase.NET.csproj
index 4b5c36b5..9c7c330c 100644
--- a/Fakes/OpenActive.FakeDatabase.NET/OpenActive.FakeDatabase.NET.csproj
+++ b/Fakes/OpenActive.FakeDatabase.NET/OpenActive.FakeDatabase.NET.csproj
@@ -34,6 +34,7 @@
     <PackageReference Include="ServiceStack.OrmLite.Sqlite.Core" Version="5.11.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="OpenActive.NET" Version="15.2.21" />
+    <PackageReference Include="ServiceStack.OrmLite.SqlServer.Data.Core" Version="5.11.0" />
   </ItemGroup>
 
   <PropertyGroup>