diff --git a/src/core/Elsa.Core/Activities/Workflows/Workflow/Workflow.cs b/src/core/Elsa.Core/Activities/Workflows/Workflow/Workflow.cs
index 0371a5a6a..df1636e86 100644
--- a/src/core/Elsa.Core/Activities/Workflows/Workflow/Workflow.cs
+++ b/src/core/Elsa.Core/Activities/Workflows/Workflow/Workflow.cs
@@ -1,5 +1,4 @@
-using Elsa.Activities.Primitives;
-using Elsa.Builders;
+using Elsa.Builders;
 using Elsa.Services;
 
 namespace Elsa.Activities.Workflows.Workflow
diff --git a/src/core/Elsa.Core/Builders/CompositeActivityBuilder.cs b/src/core/Elsa.Core/Builders/CompositeActivityBuilder.cs
index cf73a0f8e..90e65b5a9 100644
--- a/src/core/Elsa.Core/Builders/CompositeActivityBuilder.cs
+++ b/src/core/Elsa.Core/Builders/CompositeActivityBuilder.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Elsa.Activities.Primitives;
 using Elsa.Services;
 using Elsa.Services.Models;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/core/Elsa.Core/ElsaOptions.cs b/src/core/Elsa.Core/ElsaOptions.cs
index 27f91883a..29e028116 100644
--- a/src/core/Elsa.Core/ElsaOptions.cs
+++ b/src/core/Elsa.Core/ElsaOptions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Data;
 using Elsa.Caching;
 using Elsa.DistributedLock;
 using Elsa.Extensions;
@@ -15,6 +16,7 @@ using YesSql;
 using Elsa.YesSql.Provider.Sqlite.InMemory;
 using Storage.Net;
 using Storage.Net.Blobs;
+using YesSql.Provider.Sqlite;
 
 namespace Elsa
 {
@@ -24,7 +26,7 @@ namespace Elsa
         {
             Services = services;
 
-            ConfigurePersistence = (sp, config) => config.UseInMemorySqlite();
+            ConfigurePersistence = (sp, config) => config.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted);
             StorageFactory = sp => Storage.Net.StorageFactory.Blobs.InMemory();
             DistributedLockProviderFactory = sp => new DefaultLockProvider();
             SignalFactory = sp => new Signal();
diff --git a/src/core/Elsa.Core/Services/WorkflowBlueprintMaterializer.cs b/src/core/Elsa.Core/Services/WorkflowBlueprintMaterializer.cs
index d37c0a316..5f821f84a 100644
--- a/src/core/Elsa.Core/Services/WorkflowBlueprintMaterializer.cs
+++ b/src/core/Elsa.Core/Services/WorkflowBlueprintMaterializer.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Elsa.Builders;
 using Elsa.Models;
 using Elsa.Services.Models;
 
diff --git a/src/samples/Elsa.Samples.ContextualWorkflowHttp/Startup.cs b/src/samples/Elsa.Samples.ContextualWorkflowHttp/Startup.cs
index b34463a56..1dd1b341e 100644
--- a/src/samples/Elsa.Samples.ContextualWorkflowHttp/Startup.cs
+++ b/src/samples/Elsa.Samples.ContextualWorkflowHttp/Startup.cs
@@ -13,7 +13,7 @@ namespace Elsa.Samples.ContextualWorkflowHttp
         public void ConfigureServices(IServiceCollection services)
         {
             services
-                .AddElsa(option => option.UsePersistence(db => db.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted)))
+                .AddElsa()
                 .AddHttpActivities()
                 .AddConsoleActivities()
                 .AddDataMigration<Migrations>()
diff --git a/src/samples/Elsa.Samples.CorrelationHttp/Startup.cs b/src/samples/Elsa.Samples.CorrelationHttp/Startup.cs
index 808baf52d..e4f087136 100644
--- a/src/samples/Elsa.Samples.CorrelationHttp/Startup.cs
+++ b/src/samples/Elsa.Samples.CorrelationHttp/Startup.cs
@@ -11,7 +11,7 @@ namespace Elsa.Samples.CorrelationHttp
         public void ConfigureServices(IServiceCollection services)
         {
             services
-                .AddElsa(option => option.UsePersistence(db => db.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted)))
+                .AddElsa()
                 .AddHttpActivities()
                 .AddConsoleActivities()
                 .AddWorkflow<RegistrationWorkflow>();
diff --git a/src/samples/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs b/src/samples/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs
index 551c04ebd..ec1539f80 100644
--- a/src/samples/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs
+++ b/src/samples/Elsa.Samples.DeclarativeCompositeActivitiesConsole/Program.cs
@@ -19,7 +19,7 @@ namespace Elsa.Samples.DeclarativeCompositeActivitiesConsole
         {
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
-                .AddElsa(option => option.UsePersistence(db => db.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted)))
+                .AddElsa()
                 .AddConsoleActivities()
                 .BuildServiceProvider();
 
diff --git a/src/samples/Elsa.Samples.HelloWorldConsole/Program.cs b/src/samples/Elsa.Samples.HelloWorldConsole/Program.cs
index 0b109d757..28cb9c7ab 100644
--- a/src/samples/Elsa.Samples.HelloWorldConsole/Program.cs
+++ b/src/samples/Elsa.Samples.HelloWorldConsole/Program.cs
@@ -1,6 +1,8 @@
-using System.Threading.Tasks;
+using System.Data;
+using System.Threading.Tasks;
 using Elsa.Services;
 using Microsoft.Extensions.DependencyInjection;
+using YesSql.Provider.Sqlite;
 
 namespace Elsa.Samples.HelloWorldConsole
 {
@@ -19,10 +21,10 @@ namespace Elsa.Samples.HelloWorldConsole
             var startupRunner = services.GetRequiredService<IStartupRunner>();
             await startupRunner.StartupAsync();
             
-            // Get a workflow host.
+            // Get a workflow runner.
             var workflowRunner = services.GetService<IWorkflowRunner>();
 
-            // Execute the workflow.
+            // Run the workflow.
             await workflowRunner.RunWorkflowAsync<HelloWorld>();
         }
     }
diff --git a/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountDownActivity.cs b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountDownActivity.cs
index 808b3825c..fe3f1093b 100644
--- a/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountDownActivity.cs
+++ b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountDownActivity.cs
@@ -1,5 +1,4 @@
 using Elsa.Activities.Console;
-using Elsa.Activities.Primitives;
 using Elsa.Builders;
 using Elsa.Services;
 
diff --git a/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
index b9f784494..810231ccb 100644
--- a/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
+++ b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
@@ -14,7 +14,7 @@ namespace Elsa.Samples.ProgrammaticCompositeActivitiesConsole
         {
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
-                .AddElsa(option => option.UsePersistence(db => db.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted)))
+                .AddElsa()
                 .AddConsoleActivities()
                 .AddActivity<CountDownActivity>()
                 .AddWorkflow<CompositionWorkflow>()
diff --git a/src/samples/Elsa.Samples.Serialization/Program.cs b/src/samples/Elsa.Samples.Serialization/Program.cs
index dd9c5b324..bd0743fc3 100644
--- a/src/samples/Elsa.Samples.Serialization/Program.cs
+++ b/src/samples/Elsa.Samples.Serialization/Program.cs
@@ -24,7 +24,7 @@ namespace Elsa.Samples.Serialization
         {
             // Create a service container with Elsa services.
             var services = new ServiceCollection()
-                .AddElsa(option => option.UsePersistence(db => db.UseSqLite("Data Source=elsa.db;Cache=Shared", IsolationLevel.ReadUncommitted)))
+                .AddElsa()
                 .AddConsoleActivities()
                 .BuildServiceProvider();