diff --git a/Elsa.sln b/Elsa.sln
index e5d92bec5..dc6dc0135 100644
--- a/Elsa.sln
+++ b/Elsa.sln
@@ -90,8 +90,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Activities.AzureServic
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "persistence", "persistence", "{5619F343-A270-4E31-9C52-7C85A4DD6D71}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Persistence.InMemory", "src\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj", "{BA9EE5A2-632F-4489-B59D-C7283960BCCA}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Persistence.YesSql", "src\persistence\Elsa.Persistence.YesSql\Elsa.Persistence.YesSql.csproj", "{7E14324E-7AD3-4498-AECE-C7B80FB691BC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Persistence.MongoDb", "src\persistence\Elsa.Persistence.MongoDb\Elsa.Persistence.MongoDb.csproj", "{09718131-4D0E-4EF3-B3FB-116EBE1D8702}"
@@ -274,10 +272,6 @@ Global
 		{DD607BC1-F9D9-4685-BC8F-A4056C2C31FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD607BC1-F9D9-4685-BC8F-A4056C2C31FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD607BC1-F9D9-4685-BC8F-A4056C2C31FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA9EE5A2-632F-4489-B59D-C7283960BCCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA9EE5A2-632F-4489-B59D-C7283960BCCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA9EE5A2-632F-4489-B59D-C7283960BCCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA9EE5A2-632F-4489-B59D-C7283960BCCA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E14324E-7AD3-4498-AECE-C7B80FB691BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7E14324E-7AD3-4498-AECE-C7B80FB691BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E14324E-7AD3-4498-AECE-C7B80FB691BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -432,7 +426,6 @@ Global
 		{AEA00027-F280-43A4-AC60-E2AF3014CF34} = {E42743A0-FBDD-4150-9D53-6000496D9B87}
 		{E0090EF3-C4A7-4262-9300-1D395BE25DD0} = {22E75696-6FE9-436A-9097-EE21C603F818}
 		{38429825-88AF-4F0D-9E7C-A58EC5C86DA0} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925}
-		{BA9EE5A2-632F-4489-B59D-C7283960BCCA} = {38429825-88AF-4F0D-9E7C-A58EC5C86DA0}
 		{09718131-4D0E-4EF3-B3FB-116EBE1D8702} = {38429825-88AF-4F0D-9E7C-A58EC5C86DA0}
 		{7E14324E-7AD3-4498-AECE-C7B80FB691BC} = {38429825-88AF-4F0D-9E7C-A58EC5C86DA0}
 		{164EB38A-D6D2-4092-8835-C944ECEE357C} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925}
diff --git a/Elsa.sln.DotSettings b/Elsa.sln.DotSettings
index c25f6b660..1ccc569a3 100644
--- a/Elsa.sln.DotSettings
+++ b/Elsa.sln.DotSettings
@@ -4,4 +4,5 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=src_005Cweb_005Cmodules_005CFlowsharp_002EWeb_002EViewComponents_005CClientApp_005Cnode_005Fmodules/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=src_005Cweb_005Cmodules_005CFlowsharp_002EWeb_002EViewComponents_005CClientApp_005Cnode_005Fmodules/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=src_005Cweb_005Cmodules_005CFlowsharp_002EWeb_002EViewComponents_005CAssets_005Cnode_005Fmodules/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Configurer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Materializer/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/core/Elsa.Core/ElsaOptions.cs b/src/core/Elsa.Core/ElsaOptions.cs
index dd924745d..1a0355ace 100644
--- a/src/core/Elsa.Core/ElsaOptions.cs
+++ b/src/core/Elsa.Core/ElsaOptions.cs
@@ -2,6 +2,8 @@ using System;
 using Elsa.Caching;
 using Elsa.DistributedLock;
 using Elsa.Extensions;
+using Elsa.Persistence;
+using Elsa.Persistence.InMemory;
 using Elsa.Serialization;
 using Elsa.Services;
 using Microsoft.Extensions.DependencyInjection;
@@ -22,6 +24,8 @@ namespace Elsa
         {
             Services = services;
 
+            WorkflowDefinitionStoreFactory = _ => new InMemoryWorkflowDefinitionStore();
+            WorkflowInstanceStoreFactory = _ => new InMemoryWorkflowInstanceStore();
             StorageFactory = sp => Storage.Net.StorageFactory.Blobs.InMemory();
             DistributedLockProviderFactory = sp => new DefaultLockProvider();
             SignalFactory = sp => new Signal();
@@ -49,6 +53,8 @@ namespace Elsa
 
         public IServiceCollection Services { get; }
         internal Func<IServiceProvider, IBlobStorage> StorageFactory { get; set; }
+        internal Func<IServiceProvider, IWorkflowDefinitionStore> WorkflowDefinitionStoreFactory { get; set; }
+        internal Func<IServiceProvider, IWorkflowInstanceStore> WorkflowInstanceStoreFactory { get; set; }
         internal Func<IServiceProvider, IDistributedLockProvider> DistributedLockProviderFactory { get; private set; }
         internal Func<IServiceProvider, ISignal> SignalFactory { get; private set; }
         internal Func<IServiceProvider, JsonSerializer> CreateJsonSerializer { get; private set; }
@@ -75,6 +81,18 @@ namespace Elsa
             StorageFactory = factory;
             return this;
         }
+        
+        public ElsaOptions UseWorkflowDefinitionStore(Func<IServiceProvider, IWorkflowDefinitionStore> factory)
+        {
+            WorkflowDefinitionStoreFactory = factory;
+            return this;
+        }
+        
+        public ElsaOptions UseWorkflowInstanceStore(Func<IServiceProvider, IWorkflowInstanceStore> factory)
+        {
+            WorkflowInstanceStoreFactory = factory;
+            return this;
+        }
 
         public ElsaOptions UseAutoMapper(Action addAutoMapper)
         {
diff --git a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
index 70a3156ee..f812d4143 100644
--- a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
@@ -40,6 +40,8 @@ namespace Microsoft.Extensions.DependencyInjection
 
             services
                 .AddSingleton(options)
+                .AddScoped(options.WorkflowDefinitionStoreFactory)
+                .AddScoped(options.WorkflowInstanceStoreFactory)
                 .AddSingleton(options.DistributedLockProviderFactory)
                 .AddSingleton(options.SignalFactory)
                 .AddSingleton(options.StorageFactory);
@@ -105,6 +107,7 @@ namespace Microsoft.Extensions.DependencyInjection
                 .AddSingleton<IActivityTypeProvider, TypeBasedActivityProvider>()
                 .AddWorkflowProvider<ProgrammaticWorkflowProvider>()
                 .AddWorkflowProvider<StorageWorkflowProvider>()
+                .AddWorkflowProvider<DatabaseWorkflowProvider>()
                 .AddTransient<IWorkflowBuilder, WorkflowBuilder>()
                 .AddTransient<ICompositeActivityBuilder, CompositeActivityBuilder>()
                 .AddTransient<Func<IWorkflowBuilder>>(sp => sp.GetRequiredService<IWorkflowBuilder>)
diff --git a/src/persistence/Elsa.Persistence.InMemory/InMemoryWorkflowDefinitionStore.cs b/src/core/Elsa.Core/Persistence/InMemory/InMemoryWorkflowDefinitionStore.cs
similarity index 100%
rename from src/persistence/Elsa.Persistence.InMemory/InMemoryWorkflowDefinitionStore.cs
rename to src/core/Elsa.Core/Persistence/InMemory/InMemoryWorkflowDefinitionStore.cs
diff --git a/src/persistence/Elsa.Persistence.InMemory/InMemoryWorkflowInstanceStore.cs b/src/core/Elsa.Core/Persistence/InMemory/InMemoryWorkflowInstanceStore.cs
similarity index 100%
rename from src/persistence/Elsa.Persistence.InMemory/InMemoryWorkflowInstanceStore.cs
rename to src/core/Elsa.Core/Persistence/InMemory/InMemoryWorkflowInstanceStore.cs
diff --git a/src/persistence/Elsa.Persistence.InMemory/Elsa.Persistence.InMemory.csproj b/src/persistence/Elsa.Persistence.InMemory/Elsa.Persistence.InMemory.csproj
deleted file mode 100644
index 125e6f34a..000000000
--- a/src/persistence/Elsa.Persistence.InMemory/Elsa.Persistence.InMemory.csproj
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>latest</LangVersion>
-        <RootNamespace>Elsa.Persistence.InMemory</RootNamespace>
-        <PackageVersion>1.0.0</PackageVersion>
-        <Authors>Elsa Contributors</Authors>
-        <Description>
-             Elsa is a set of workflow libraries and tools that enable super-fast workflowing capabilities in any .NET Core application.
-            This package provides a InMemory persistence provider.
-        </Description>
-        <Copyright>2020</Copyright>
-        <PackageProjectUrl>https://github.com/elsa-workflows/elsa-core</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/elsa-workflows/elsa-core</RepositoryUrl>
-        <RepositoryType>GitHub</RepositoryType>
-        <PackageTags>elsa, workflows, orchard</PackageTags>
-        <PackageIcon>icon.png</PackageIcon>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="icon.png">
-            <Pack>True</Pack>
-            <PackagePath />
-        </None>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\core\Elsa.Core\Elsa.Core.csproj" />
-    </ItemGroup>
-
-</Project>
diff --git a/src/persistence/Elsa.Persistence.InMemory/ServiceCollectionExtensions.cs b/src/persistence/Elsa.Persistence.InMemory/ServiceCollectionExtensions.cs
deleted file mode 100644
index f069de9ea..000000000
--- a/src/persistence/Elsa.Persistence.InMemory/ServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Elsa.WorkflowProviders;
-
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Elsa.Persistence.InMemory
-{
-    public static class ServiceCollectionExtensions
-    {
-        public static IServiceCollection AddElsaPersistenceInMemory(this IServiceCollection services)
-        {
-            // Scoped, because IMediator is registered as Scoped and IIdGenerator could also be registered as Scoped
-            services.AddScoped<IWorkflowDefinitionStore, InMemoryWorkflowDefinitionStore>()
-                .AddScoped<IWorkflowInstanceStore, InMemoryWorkflowInstanceStore>()
-                .AddWorkflowProvider<DatabaseWorkflowProvider>();
-
-            return services;
-        }
-    }
-}
diff --git a/src/persistence/Elsa.Persistence.InMemory/icon.png b/src/persistence/Elsa.Persistence.InMemory/icon.png
deleted file mode 100644
index 28dbaafbf..000000000
Binary files a/src/persistence/Elsa.Persistence.InMemory/icon.png and /dev/null differ
diff --git a/src/persistence/Elsa.Persistence.MongoDb/ServiceCollectionExtensions.cs b/src/persistence/Elsa.Persistence.MongoDb/ServiceCollectionExtensions.cs
index 0270fbf82..7cbf17f78 100644
--- a/src/persistence/Elsa.Persistence.MongoDb/ServiceCollectionExtensions.cs
+++ b/src/persistence/Elsa.Persistence.MongoDb/ServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using Elsa.Extensions;
 using Elsa.Persistence.MongoDb.Services;
 using Elsa.Runtime;
 using Elsa.WorkflowProviders;
@@ -9,31 +10,35 @@ namespace Elsa.Persistence.MongoDb
 {
     public static class ServiceCollectionExtensions
     {
-        public static IServiceCollection AddElsaPersistenceMongoDb(this IServiceCollection services, Action<ElsaMongoDbOptions> configureOptions)
+        public static ElsaOptions UseMongoDbPersistence(this ElsaOptions elsa, Action<ElsaMongoDbOptions> configureOptions)
         {
-            AddCore(services);
-            services.Configure(configureOptions);
+            AddCore(elsa);
+            elsa.Services.Configure(configureOptions);
 
-            return services;
+            return elsa;
         }
 
-        public static IServiceCollection AddElsaPersistenceMongoDb(this IServiceCollection services, IConfiguration options)
+        public static ElsaOptions UseMongoDbPersistence(this ElsaOptions elsa, IConfiguration options)
         {
-            AddCore(services);
-            services.Configure<ElsaMongoDbOptions>(options);
-            return services;
+            AddCore(elsa);
+            elsa.Services.Configure<ElsaMongoDbOptions>(options);
+            return elsa;
         }
 
-        private static void AddCore(IServiceCollection services)
+        private static void AddCore(ElsaOptions elsa)
         {
-            services.AddScoped<IWorkflowDefinitionStore, MongoDbWorkflowDefinitionStore>()
-                .AddScoped<IWorkflowInstanceStore, MongoDbWorkflowInstanceStore>()            
+            elsa.Services
+                .AddScoped<MongoDbWorkflowDefinitionStore>()
+                .AddScoped<MongoDbWorkflowInstanceStore>()            
                 .AddScoped<ElsaMongoDbClient>()
                 .AddScoped(sp => sp.GetRequiredService<ElsaMongoDbClient>().WorkflowDefinitions)
                 .AddScoped(sp => sp.GetRequiredService<ElsaMongoDbClient>().WorkflowInstances)
-                .AddWorkflowProvider<DatabaseWorkflowProvider>()
                 .AddStartupTask<DatabaseInitializer>();
 
+            elsa
+                .UseWorkflowDefinitionStore(sp => sp.GetRequiredService<MongoDbWorkflowDefinitionStore>())
+                .UseWorkflowInstanceStore(sp => sp.GetRequiredService<MongoDbWorkflowInstanceStore>());
+            
             DatabaseRegister.RegisterMapsAndSerializers();
         }
     }
diff --git a/src/persistence/Elsa.Persistence.YesSql/Elsa.Persistence.YesSql.csproj b/src/persistence/Elsa.Persistence.YesSql/Elsa.Persistence.YesSql.csproj
index faa0e7022..ebf3a5934 100644
--- a/src/persistence/Elsa.Persistence.YesSql/Elsa.Persistence.YesSql.csproj
+++ b/src/persistence/Elsa.Persistence.YesSql/Elsa.Persistence.YesSql.csproj
@@ -28,6 +28,7 @@
 
     <ItemGroup>
       <PackageReference Include="YesSql.Core" Version="2.0.0-beta-1637" />
+      <PackageReference Include="YesSql.Provider.Sqlite" Version="1.0.0-beta-1637" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/persistence/Elsa.Persistence.YesSql/IServiceCollectionExtensions.cs b/src/persistence/Elsa.Persistence.YesSql/ServiceCollectionExtensions.cs
similarity index 63%
rename from src/persistence/Elsa.Persistence.YesSql/IServiceCollectionExtensions.cs
rename to src/persistence/Elsa.Persistence.YesSql/ServiceCollectionExtensions.cs
index 99a39b07b..458d2ce81 100644
--- a/src/persistence/Elsa.Persistence.YesSql/IServiceCollectionExtensions.cs
+++ b/src/persistence/Elsa.Persistence.YesSql/ServiceCollectionExtensions.cs
@@ -1,39 +1,41 @@
 using System;
+using System.Data;
 using System.Linq;
-
 using Elsa.Data;
 using Elsa.Data.Services;
 using Elsa.Persistence.YesSql.Data;
 using Elsa.Persistence.YesSql.Indexes;
 using Elsa.Persistence.YesSql.Services;
 using Elsa.Runtime;
-using Elsa.WorkflowProviders;
-
 using Microsoft.Extensions.DependencyInjection;
-
 using YesSql;
 using YesSql.Indexes;
+using YesSql.Provider.Sqlite;
 
 namespace Elsa.Persistence.YesSql
 {
-    public static class IServiceCollectionExtensions
+    public static class ServiceCollectionExtensions
     {
-        public static IServiceCollection AddElsaPersistenceYesSql(this IServiceCollection services, Action<IServiceProvider, IConfiguration> configure)
+        public static ElsaOptions UseYesSqlPersistence(this ElsaOptions elsa) => elsa.UseYesSqlPersistence((_, config) => config.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted));
+
+        public static ElsaOptions UseYesSqlPersistence(this ElsaOptions elsa, Action<IServiceProvider, IConfiguration> configure)
         {
             // Scoped, because IMediator is registered as Scoped and IIdGenerator could also be registered as Scoped
-            services.AddScoped<IWorkflowDefinitionStore, YesSqlWorkflowDefinitionStore>()
-                .AddScoped<IWorkflowInstanceStore, YesSqlWorkflowInstanceStore>()
-               .AddWorkflowProvider<DatabaseWorkflowProvider>()
-               .AddSingleton(sp => CreateStore(sp, configure))
-               .AddScoped(CreateSession)
-               .AddScoped<IDataMigrationManager, DataMigrationManager>()
-               .AddStartupTask<DatabaseInitializer>()
-               .AddStartupTask<DataMigrationsRunner>()
-               .AddDataMigration<Migrations>()
-               .AddIndexProvider<WorkflowDefinitionIndexProvider>()
-               .AddIndexProvider<WorkflowInstanceIndexProvider>();
+            elsa.Services
+                .AddScoped<YesSqlWorkflowDefinitionStore>()
+                .AddScoped<YesSqlWorkflowInstanceStore>()
+                .AddSingleton(sp => CreateStore(sp, configure))
+                .AddScoped(CreateSession)
+                .AddScoped<IDataMigrationManager, DataMigrationManager>()
+                .AddStartupTask<DatabaseInitializer>()
+                .AddStartupTask<DataMigrationsRunner>()
+                .AddDataMigration<Migrations>()
+                .AddIndexProvider<WorkflowDefinitionIndexProvider>()
+                .AddIndexProvider<WorkflowInstanceIndexProvider>();
 
-            return services;
+            return elsa
+                .UseWorkflowDefinitionStore(sp => sp.GetRequiredService<YesSqlWorkflowDefinitionStore>())
+                .UseWorkflowInstanceStore(sp => sp.GetRequiredService<YesSqlWorkflowInstanceStore>());
         }
 
         public static IServiceCollection AddIndexProvider<T>(this IServiceCollection services) where T : class, IIndexProvider => services.AddSingleton<IIndexProvider, T>();
@@ -68,4 +70,6 @@ namespace Elsa.Persistence.YesSql
             return session;
         }
     }
-}
+    
+    
+}
\ No newline at end of file
diff --git a/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Startup.cs
index 8e05d1456..3dab9d169 100644
--- a/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Startup.cs
+++ b/src/samples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Startup.cs
@@ -14,8 +14,7 @@ namespace Elsa.Samples.ContextualWorkflowHttp
         public void ConfigureServices(IServiceCollection services)
         {
             services
-                .AddElsa()
-                .AddElsaPersistenceYesSql((sp, config) => config.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted))
+                .AddElsa(options => options.UseYesSqlPersistence())
                 .AddHttpActivities()
                 .AddConsoleActivities()
                 .AddDataMigration<Migrations>()
diff --git a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj
index cc3f0c630..30563aa3f 100644
--- a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Elsa.Samples.CorrelationHttp.csproj
@@ -7,7 +7,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Startup.cs
index 8607dae16..194b18331 100644
--- a/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Startup.cs
+++ b/src/samples/aspnet/Elsa.Samples.CorrelationHttp/Startup.cs
@@ -1,4 +1,3 @@
-using Elsa.Persistence.InMemory;
 using Elsa.Samples.CorrelationHttp.Workflows;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,7 +10,6 @@ namespace Elsa.Samples.CorrelationHttp
         {
             services
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddHttpActivities()
                 .AddConsoleActivities()
                 .AddWorkflow<RegistrationWorkflow>();
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj b/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj
index cc3f0c630..30563aa3f 100644
--- a/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj
+++ b/src/samples/aspnet/Elsa.Samples.CustomActivities/Elsa.Samples.CustomActivities.csproj
@@ -7,7 +7,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivities/Startup.cs b/src/samples/aspnet/Elsa.Samples.CustomActivities/Startup.cs
index 2eab94840..66432cddb 100644
--- a/src/samples/aspnet/Elsa.Samples.CustomActivities/Startup.cs
+++ b/src/samples/aspnet/Elsa.Samples.CustomActivities/Startup.cs
@@ -1,5 +1,3 @@
-using Elsa.Persistence.InMemory;
-
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -11,7 +9,6 @@ namespace Elsa.Samples.CustomActivities
         {
             services
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddHttpActivities()
                 .AddActivity<ReadQueryString>()
                 .AddWorkflow<EchoQueryStringWorkflow>();
diff --git a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj
index 44152dfae..57eec47d7 100644
--- a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Elsa.Samples.ForkJoinTimerAndSignalHttp.csproj
@@ -7,6 +7,5 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Startup.cs
index db42a50b3..6f224bc5d 100644
--- a/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Startup.cs
+++ b/src/samples/aspnet/Elsa.Samples.ForkJoinTimerAndSignalHttp/Startup.cs
@@ -1,4 +1,3 @@
-using Elsa.Persistence.InMemory;
 using Elsa.Samples.ForkJoinTimerAndSignalHttp.BackgroundTasks;
 using Elsa.Samples.ForkJoinTimerAndSignalHttp.Workflows;
 using Microsoft.AspNetCore.Builder;
@@ -15,7 +14,6 @@ namespace Elsa.Samples.ForkJoinTimerAndSignalHttp
             
             services
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .AddTimerActivities()
                 .AddHostedService<WorkflowStarter<DemoWorkflow>>()
diff --git a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj
index cc3f0c630..30563aa3f 100644
--- a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Elsa.Samples.HelloWorldHttp.csproj
@@ -7,7 +7,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs
index ac068fb57..b0ee75523 100644
--- a/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs
+++ b/src/samples/aspnet/Elsa.Samples.HelloWorldHttp/Startup.cs
@@ -1,5 +1,3 @@
-using Elsa.Persistence.InMemory;
-
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -11,7 +9,6 @@ namespace Elsa.Samples.HelloWorldHttp
         {
             services
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddHttpActivities()
                 .AddWorkflow<HelloHttpWorkflow>();
         }
diff --git a/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj b/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj
index 5124a3b41..06e0c8e81 100644
--- a/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj
@@ -8,7 +8,6 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-      <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs
index 00d194db9..19bb61269 100644
--- a/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs
@@ -1,4 +1,3 @@
-using Elsa.Persistence.InMemory;
 using Elsa.Samples.Interrupts.Activities;
 using Elsa.Samples.Interrupts.Workflows;
 using Microsoft.AspNetCore.Builder;
@@ -15,7 +14,6 @@ namespace Elsa.Samples.Interrupts
             
             services
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .AddHttpActivities()
                 .AddTimerActivities()
diff --git a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj
index b004a9e65..30563aa3f 100644
--- a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj
+++ b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Elsa.Samples.ReadModelHttp.csproj
@@ -6,8 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
+        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Startup.cs b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Startup.cs
index 6a55a1259..9d0b86c1a 100644
--- a/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Startup.cs
+++ b/src/samples/aspnet/Elsa.Samples.ReadModelHttp/Startup.cs
@@ -1,4 +1,3 @@
-using Elsa.Persistence.InMemory;
 using Elsa.Samples.ReadModelHttp.Workflows;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,7 +10,6 @@ namespace Elsa.Samples.ReadModelHttp
         {
             services
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddHttpActivities()
                 .AddConsoleActivities()
                 .AddWorkflow<SaveContactWorkflow>();
diff --git a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj
index ad524e643..1e354fe70 100644
--- a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj
+++ b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Elsa.Samples.DeclarativeCompositeActivitiesConsole.csproj
@@ -12,7 +12,6 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-      <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs
index a11899bef..4c18ac2ea 100644
--- a/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs
@@ -18,7 +18,6 @@ namespace Elsa.Samples.DeclarativeCompositeActivitiesConsole
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .BuildServiceProvider();
 
diff --git a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj
index 1ed5eb730..b5a89fc88 100644
--- a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj
+++ b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Elsa.Samples.FileBasedWorkflow.csproj
@@ -12,7 +12,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs
index 0a8b234a2..16b0fc17b 100644
--- a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs
+++ b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs
@@ -22,7 +22,6 @@ namespace Elsa.Samples.FileBasedWorkflow
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa(options => options.UseStorage(() => StorageFactory.Blobs.DirectoryFiles(currentDirectory)))
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .BuildServiceProvider();
             
diff --git a/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj b/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj
index b22c3b4a1..e4cdfd97b 100644
--- a/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj
+++ b/src/samples/console/Elsa.Samples.ForLoopConsole/Elsa.Samples.ForLoopConsole.csproj
@@ -12,7 +12,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.ForLoopConsole/Program.cs b/src/samples/console/Elsa.Samples.ForLoopConsole/Program.cs
index db6c44fe6..5a47c41e7 100644
--- a/src/samples/console/Elsa.Samples.ForLoopConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.ForLoopConsole/Program.cs
@@ -16,7 +16,6 @@ namespace Elsa.Samples.ForLoopConsole
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .AddWorkflow<LoopingWorkflow>()
                 .BuildServiceProvider();
diff --git a/src/samples/console/Elsa.Samples.GoBackConsole/Elsa.Samples.GoBackConsole.csproj b/src/samples/console/Elsa.Samples.GoBackConsole/Elsa.Samples.GoBackConsole.csproj
index 132d8fd66..636f8d393 100644
--- a/src/samples/console/Elsa.Samples.GoBackConsole/Elsa.Samples.GoBackConsole.csproj
+++ b/src/samples/console/Elsa.Samples.GoBackConsole/Elsa.Samples.GoBackConsole.csproj
@@ -13,7 +13,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.GoBackConsole/Program.cs b/src/samples/console/Elsa.Samples.GoBackConsole/Program.cs
index e52f23bbc..6db4abead 100644
--- a/src/samples/console/Elsa.Samples.GoBackConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.GoBackConsole/Program.cs
@@ -18,7 +18,6 @@ namespace Elsa.Samples.GoBackConsole
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .AddActivity<BrickWallActivity>()
                 .AddWorkflow<WalkAroundWorkflow>()
diff --git a/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj b/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj
index b22c3b4a1..e4cdfd97b 100644
--- a/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj
+++ b/src/samples/console/Elsa.Samples.HelloWorldConsole/Elsa.Samples.HelloWorldConsole.csproj
@@ -12,7 +12,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs b/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs
index b82ede3b3..7576103d1 100644
--- a/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.HelloWorldConsole/Program.cs
@@ -13,7 +13,6 @@ namespace Elsa.Samples.HelloWorldConsole
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .AddWorkflow<HelloWorld>()
                 .AddAutoMapperProfiles<Program>()
diff --git a/src/samples/console/Elsa.Samples.IfElseConsole/Elsa.Samples.IfElseConsole.csproj b/src/samples/console/Elsa.Samples.IfElseConsole/Elsa.Samples.IfElseConsole.csproj
index 132d8fd66..636f8d393 100644
--- a/src/samples/console/Elsa.Samples.IfElseConsole/Elsa.Samples.IfElseConsole.csproj
+++ b/src/samples/console/Elsa.Samples.IfElseConsole/Elsa.Samples.IfElseConsole.csproj
@@ -13,7 +13,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.IfElseConsole/Program.cs b/src/samples/console/Elsa.Samples.IfElseConsole/Program.cs
index 8692294fc..4ee11f8df 100644
--- a/src/samples/console/Elsa.Samples.IfElseConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.IfElseConsole/Program.cs
@@ -16,7 +16,6 @@ namespace Elsa.Samples.IfElseConsole
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .AddWorkflow<HappinessWorkflow>()
                 .BuildServiceProvider();
diff --git a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj
index b22c3b4a1..e4cdfd97b 100644
--- a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj
+++ b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj
@@ -12,7 +12,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
index 89dd1b01a..1ad49f955 100644
--- a/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
@@ -15,7 +15,6 @@ namespace Elsa.Samples.ProgrammaticCompositeActivitiesConsole
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .AddActivity<CountDownActivity>()
                 .AddWorkflow<CompositionWorkflow>()
diff --git a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj
index b22c3b4a1..10f5960c5 100644
--- a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj
+++ b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Elsa.Samples.ReadLineEchoConsole.csproj
@@ -7,12 +7,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
+        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Program.cs b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Program.cs
index 85968963c..2520b1ece 100644
--- a/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.ReadLineEchoConsole/Program.cs
@@ -14,7 +14,6 @@ namespace Elsa.Samples.ReadLineEchoConsole
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .BuildServiceProvider();
             
@@ -23,14 +22,14 @@ namespace Elsa.Samples.ReadLineEchoConsole
             await startupRunner.StartupAsync();
             
             // Build a new workflow.
-            var workflow = services.GetService<IWorkflowBuilder>()
+            var workflow = services.GetRequiredService<IWorkflowBuilder>()
                 .WriteLine("What's your name?")
                 .ReadLine()
                 .WriteLine(context => $"Greetings, {context.Input}!")
                 .Build();
             
             // Get a workflow runner.
-            var workflowRunner = services.GetService<IWorkflowRunner>();
+            var workflowRunner = services.GetRequiredService<IWorkflowRunner>();
 
             // Execute the workflow.
             await workflowRunner.RunWorkflowAsync(workflow);
diff --git a/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj b/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj
index 60f5f467a..72fc1f925 100644
--- a/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj
+++ b/src/samples/console/Elsa.Samples.Serialization/Elsa.Samples.Serialization.csproj
@@ -7,12 +7,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
+        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.Serialization/Program.cs b/src/samples/console/Elsa.Samples.Serialization/Program.cs
index 12dd3096a..a9d3d69a0 100644
--- a/src/samples/console/Elsa.Samples.Serialization/Program.cs
+++ b/src/samples/console/Elsa.Samples.Serialization/Program.cs
@@ -17,14 +17,13 @@ namespace Elsa.Samples.Serialization
     /// 3. Materialize a workflow definition model into a workflow blueprint.
     /// 4. Run a workflow blueprint.
     /// </summary>
-    class Program
+    internal class Program
     {
-        static async Task Main(string[] args)
+        private static async Task Main()
         {
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .BuildServiceProvider();
             
@@ -50,7 +49,7 @@ namespace Elsa.Samples.Serialization
                         Type = nameof(WriteLine),
                         Properties = new ActivityDefinitionProperties
                         {
-                            [nameof(WriteLine.Text)] = new ActivityDefinitionPropertyValue
+                            [nameof(WriteLine.Text)] = new()
                             {
                                 Syntax = LiquidExpressionHandler.SyntaxName,
                                 Expression = "Hello World!",
diff --git a/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj b/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj
index b22c3b4a1..10f5960c5 100644
--- a/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj
+++ b/src/samples/console/Elsa.Samples.SignalingConsole/Elsa.Samples.SignalingConsole.csproj
@@ -7,12 +7,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
+        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.SignalingConsole/Program.cs b/src/samples/console/Elsa.Samples.SignalingConsole/Program.cs
index 9a850b848..62b3312bc 100644
--- a/src/samples/console/Elsa.Samples.SignalingConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.SignalingConsole/Program.cs
@@ -10,14 +10,13 @@ namespace Elsa.Samples.SignalingConsole
     /// <summary>
     /// Demonstrates a workflow with a While looping construct.
     /// </summary>
-    static class Program
+    internal static class Program
     {
         private static async Task Main()
         {
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .AddWorkflow<TrafficLightWorkflow>()
                 .BuildServiceProvider();
diff --git a/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj b/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj
index b22c3b4a1..10f5960c5 100644
--- a/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj
+++ b/src/samples/console/Elsa.Samples.WhileLoopConsole/Elsa.Samples.WhileLoopConsole.csproj
@@ -7,12 +7,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
+        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/console/Elsa.Samples.WhileLoopConsole/Program.cs b/src/samples/console/Elsa.Samples.WhileLoopConsole/Program.cs
index f0b4a5b7c..269e5328a 100644
--- a/src/samples/console/Elsa.Samples.WhileLoopConsole/Program.cs
+++ b/src/samples/console/Elsa.Samples.WhileLoopConsole/Program.cs
@@ -9,14 +9,13 @@ namespace Elsa.Samples.WhileLoopConsole
     /// <summary>
     /// Demonstrates a workflow with a While looping construct.
     /// </summary>
-    static class Program
+    internal static class Program
     {
         private static async Task Main()
         {
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities()
                 .BuildServiceProvider();
             
diff --git a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj
index 24977887d..94fafe95f 100644
--- a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj
+++ b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Elsa.Samples.AzureServiceBusWorker.csproj
@@ -6,12 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\..\activities\Elsa.Activities.AzureServiceBus\Elsa.Activities.AzureServiceBus.csproj" />
-      <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
+        <ProjectReference Include="..\..\..\activities\Elsa.Activities.AzureServiceBus\Elsa.Activities.AzureServiceBus.csproj"/>
+        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
     </ItemGroup>
 </Project>
diff --git a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs
index c7ab17730..aeb61a74e 100644
--- a/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs
+++ b/src/samples/worker/Elsa.Samples.AzureServiceBusWorker/Program.cs
@@ -20,7 +20,6 @@ namespace Elsa.Samples.AzureServiceBusWorker
                 {
                     services
                         .AddElsa()
-                        .AddElsaPersistenceInMemory()
                         .AddConsoleActivities()
                         .AddTimerActivities()
                         .AddAzureServiceBusActivities(options => options.ConnectionString = hostContext.Configuration.GetConnectionString("AzureServiceBus"))
diff --git a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj
index 0f6c54a63..df4539f84 100644
--- a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj
+++ b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Elsa.Samples.CustomAttributesChildWorker.csproj
@@ -7,12 +7,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\activities\Elsa.Activities.Rebus\Elsa.Activities.Rebus.csproj" />
-        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
+        <ProjectReference Include="..\..\..\activities\Elsa.Activities.Rebus\Elsa.Activities.Rebus.csproj"/>
+        <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
     </ItemGroup>
 </Project>
diff --git a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Program.cs b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Program.cs
index 1fc6d0f69..122e03f42 100644
--- a/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Program.cs
+++ b/src/samples/worker/Elsa.Samples.CustomAttributesChildWorker/Program.cs
@@ -1,4 +1,3 @@
-using Elsa.Persistence.InMemory;
 using Elsa.Samples.CustomAttributesChildWorker.Messages;
 using Elsa.Samples.CustomAttributesChildWorker.Workflows;
 using Microsoft.Extensions.DependencyInjection;
@@ -13,14 +12,13 @@ namespace Elsa.Samples.CustomAttributesChildWorker
             CreateHostBuilder(args).Build().Run();
         }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
+        private static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureServices(
-                    (hostContext, services) =>
+                    (_, services) =>
                     {
                         services
                             .AddElsa()
-                            .AddElsaPersistenceInMemory()
                             .AddTimerActivities()
                             .AddConsoleActivities()
                             .AddRebusActivities<OrderReceived>()
diff --git a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj
index e05411161..5c4c3a7be 100644
--- a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj
+++ b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj
@@ -16,7 +16,6 @@
         <ProjectReference Include="..\..\..\activities\Elsa.Activities.Timers\Elsa.Activities.Timers.csproj"/>
         <ProjectReference Include="..\..\..\providers\Elsa.DistributedLocking.Redis\Elsa.DistributedLocking.Redis.csproj"/>
         <ProjectReference Include="..\..\..\providers\Elsa.DistributedLocking.SqlServer\Elsa.DistributedLocking.SqlServer.csproj"/>
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/worker/Elsa.Samples.DistributedLock/Program.cs b/src/samples/worker/Elsa.Samples.DistributedLock/Program.cs
index 1480fe9ca..692c449ae 100644
--- a/src/samples/worker/Elsa.Samples.DistributedLock/Program.cs
+++ b/src/samples/worker/Elsa.Samples.DistributedLock/Program.cs
@@ -1,5 +1,3 @@
-using Elsa.Persistence.InMemory;
-
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System.Threading.Tasks;
@@ -14,14 +12,13 @@ namespace Elsa.Samples.DistributedLock
     {
         private static async Task Main() => await CreateHostBuilder().UseConsoleLifetime().Build().RunAsync();
 
-        public static IHostBuilder CreateHostBuilder() =>
+        private static IHostBuilder CreateHostBuilder() =>
             Host.CreateDefaultBuilder()
                 .ConfigureServices(
-                    (hostContext, services) =>
+                    (_, services) =>
                     {
                         services
                             .AddElsa(options => options.UseRedisLockProvider("localhost:6379,abortConnect=false"))
-                            .AddElsaPersistenceInMemory()
                             .AddConsoleActivities()
                             .AddTimerActivities()
                             .AddWorkflow<RecurringWorkflow>();
diff --git a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj
index 7292594ea..40cc8357e 100644
--- a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj
+++ b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Elsa.Samples.MultiTenantChildWorker.csproj
@@ -12,6 +12,5 @@
     <ItemGroup>
         <ProjectReference Include="..\..\..\activities\Elsa.Activities.Rebus\Elsa.Activities.Rebus.csproj"/>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Program.cs b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Program.cs
index eae4f24a7..d51420ea7 100644
--- a/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Program.cs
+++ b/src/samples/worker/Elsa.Samples.MultiTenantChildWorker/Program.cs
@@ -1,4 +1,3 @@
-using Elsa.Persistence.InMemory;
 using Elsa.Samples.MultiTenantChildWorker.Messages;
 using Elsa.Samples.MultiTenantChildWorker.Workflows;
 using Microsoft.Extensions.DependencyInjection;
@@ -13,14 +12,13 @@ namespace Elsa.Samples.MultiTenantChildWorker
             CreateHostBuilder(args).Build().Run();
         }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
+        private static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureServices(
-                    (hostContext, services) =>
+                    (_, services) =>
                     {
                         services
                             .AddElsa()
-                            .AddElsaPersistenceInMemory()
                             .AddTimerActivities()
                             .AddConsoleActivities()
                             .AddRebusActivities<OrderReceived>()
diff --git a/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj b/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj
index ec785d4b0..48327090e 100644
--- a/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj
+++ b/src/samples/worker/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj
@@ -15,6 +15,5 @@
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
         <ProjectReference Include="..\..\..\servicebus\Elsa.Rebus.AzureServiceBus\Elsa.Rebus.AzureServiceBus.csproj"/>
         <ProjectReference Include="..\..\..\servicebus\Elsa.Rebus.RabbitMq\Elsa.Rebus.RabbitMq.csproj"/>
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/samples/worker/Elsa.Samples.RebusWorker/Program.cs b/src/samples/worker/Elsa.Samples.RebusWorker/Program.cs
index 56811f576..f1346dfca 100644
--- a/src/samples/worker/Elsa.Samples.RebusWorker/Program.cs
+++ b/src/samples/worker/Elsa.Samples.RebusWorker/Program.cs
@@ -1,4 +1,3 @@
-using Elsa.Persistence.InMemory;
 using Elsa.Samples.RebusWorker.Messages;
 using Elsa.Samples.RebusWorker.Workflows;
 using Microsoft.Extensions.DependencyInjection;
@@ -8,18 +7,14 @@ namespace Elsa.Samples.RebusWorker
 {
     public class Program
     {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+        public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
+        private static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
-                .ConfigureServices((hostContext, services) =>
+                .ConfigureServices((_, services) =>
                 {
                     services
                         .AddElsa()
-                        .AddElsaPersistenceInMemory()
                         .AddConsoleActivities()
                         .AddTimerActivities()
                         .AddRebusActivities<Greeting>()
diff --git a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj
index d65c9bd1d..0c4b09476 100644
--- a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj
+++ b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Elsa.Samples.RunChildWorkflowWorker.csproj
@@ -11,6 +11,5 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Program.cs b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Program.cs
index 2faaccae8..25eec5772 100644
--- a/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Program.cs
+++ b/src/samples/worker/Elsa.Samples.RunChildWorkflowWorker/Program.cs
@@ -1,4 +1,3 @@
-using Elsa.Persistence.InMemory;
 using Elsa.Samples.RunChildWorkflowWorker.HostedServices;
 using Elsa.Samples.RunChildWorkflowWorker.Workflows;
 using Microsoft.Extensions.DependencyInjection;
@@ -8,19 +7,15 @@ namespace Elsa.Samples.RunChildWorkflowWorker
 {
     public class Program
     {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+        public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
+        private static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureServices(
-                    (hostContext, services) =>
+                    (_, services) =>
                     {
                         services
                             .AddElsa()
-                            .AddElsaPersistenceInMemory()
                             .AddConsoleActivities()
                             .AddHostedService<RunParentWorkflow>()
                             .AddWorkflow<ParentWorkflow>()
diff --git a/src/samples/worker/Elsa.Samples.Timers/Elsa.Samples.Timers.csproj b/src/samples/worker/Elsa.Samples.Timers/Elsa.Samples.Timers.csproj
index f1b6377b0..72fc1f925 100644
--- a/src/samples/worker/Elsa.Samples.Timers/Elsa.Samples.Timers.csproj
+++ b/src/samples/worker/Elsa.Samples.Timers/Elsa.Samples.Timers.csproj
@@ -12,7 +12,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/samples/worker/Elsa.Samples.Timers/Program.cs b/src/samples/worker/Elsa.Samples.Timers/Program.cs
index 9e6ccef91..a371509f7 100644
--- a/src/samples/worker/Elsa.Samples.Timers/Program.cs
+++ b/src/samples/worker/Elsa.Samples.Timers/Program.cs
@@ -1,7 +1,4 @@
 using System.Threading.Tasks;
-
-using Elsa.Persistence.InMemory;
-
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using NodaTime;
@@ -12,14 +9,13 @@ namespace Elsa.Samples.Timers
     {
         private static async Task Main() => await CreateHostBuilder().UseConsoleLifetime().Build().RunAsync();
 
-        public static IHostBuilder CreateHostBuilder() =>
+        private static IHostBuilder CreateHostBuilder() =>
             Host.CreateDefaultBuilder()
                 .ConfigureServices(
-                    (hostContext, services) =>
+                    (_, services) =>
                     {
                         services
                             .AddElsa()
-                            .AddElsaPersistenceInMemory()
                             .AddConsoleActivities()
                             .AddTimerActivities()
                             .AddWorkflow<RecurringTaskWorkflow>()
diff --git a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj
index d65c9bd1d..0c4b09476 100644
--- a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj
+++ b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Elsa.Samples.WhileLoopWorker.csproj
@@ -11,6 +11,5 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
-        <ProjectReference Include="..\..\..\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Program.cs b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Program.cs
index 16ba5275e..fbf37c630 100644
--- a/src/samples/worker/Elsa.Samples.WhileLoopWorker/Program.cs
+++ b/src/samples/worker/Elsa.Samples.WhileLoopWorker/Program.cs
@@ -8,19 +8,15 @@ namespace Elsa.Samples.WhileLoopWorker
 {
     public class Program
     {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+        public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
+        private static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .ConfigureServices(
-                    (hostContext, services) =>
+                    (_, services) =>
                     {
                         services
                             .AddElsa()
-                            .AddElsaPersistenceInMemory()
                             .AddConsoleActivities()
                             .AddTimerActivities()
                             .AddSingleton<PhoneCallService>()
diff --git a/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj b/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj
index 97db11fc8..6318391b0 100644
--- a/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj
+++ b/src/server/Elsa.Server.Host/Elsa.Server.Host.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="YesSql.Provider.Sqlite" Version="1.0.0-beta-1620" />
+        <PackageReference Include="YesSql.Provider.Sqlite" Version="1.0.0-beta-1637" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/server/Elsa.Server.Host/Startup.cs b/src/server/Elsa.Server.Host/Startup.cs
index 237ec82da..93a4473f0 100644
--- a/src/server/Elsa.Server.Host/Startup.cs
+++ b/src/server/Elsa.Server.Host/Startup.cs
@@ -26,11 +26,9 @@ namespace Elsa.Server.Host
         public void ConfigureServices(IServiceCollection services)
         {
             var elsaSection = Configuration.GetSection("Elsa");
-            var connectionString = Configuration.GetConnectionString("Sqlite");
 
             services
-                .AddElsa()
-                .AddElsaPersistenceYesSql((sp, config) => config.UseSqLite(connectionString, IsolationLevel.ReadUncommitted));
+                .AddElsa(options => options.UseYesSqlPersistence());
 
             services
                 .AddElsaApiEndpoints()
diff --git a/src/server/Elsa.Server.Host/appsettings.json b/src/server/Elsa.Server.Host/appsettings.json
index dd6bab560..9a01e5fc6 100644
--- a/src/server/Elsa.Server.Host/appsettings.json
+++ b/src/server/Elsa.Server.Host/appsettings.json
@@ -7,9 +7,6 @@
         }
     },
     "AllowedHosts": "*",
-    "ConnectionStrings": {
-        "Sqlite": "Data Source=elsa.db;Cache=Shared"
-    },
     "Elsa": {
         "Http": {
             "BaseUrl": "http://localhost:16398"
@@ -18,9 +15,6 @@
             "Host": "localhost",
             "Port": "2525",
             "DefaultSender": "noreply@acme.com"
-        },
-        "Timers": {
-            "SweepInterval": "00:00:30"
         }
     }
 }
diff --git a/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj b/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj
index 8d93770d2..868ae0ed7 100644
--- a/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj
+++ b/test/shared/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj
@@ -35,7 +35,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\core\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\src\persistence\Elsa.Persistence.InMemory\Elsa.Persistence.InMemory.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/test/shared/Elsa.Testing.Shared/Unit/WorkflowsUnitTestBase.cs b/test/shared/Elsa.Testing.Shared/Unit/WorkflowsUnitTestBase.cs
index 35fe3a67b..3baf7f2ac 100644
--- a/test/shared/Elsa.Testing.Shared/Unit/WorkflowsUnitTestBase.cs
+++ b/test/shared/Elsa.Testing.Shared/Unit/WorkflowsUnitTestBase.cs
@@ -22,7 +22,6 @@ namespace Elsa.Testing.Shared.Unit
 
             var services = new ServiceCollection()
                 .AddElsa()
-                .AddElsaPersistenceInMemory()
                 .AddConsoleActivities(Console.In, new XunitConsoleForwarder(testOutputHelper));
             
             configureServices?.Invoke(services);