diff --git a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/App.razor b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/App.razor
index eb5c93b..1c360b7 100644
--- a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/App.razor
+++ b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/App.razor
@@ -1,5 +1,10 @@
-<Router AppAssembly="typeof(Program).Assembly">
-    <NotFoundContent>
-        <p>Sorry, there's nothing at this address.</p>
-    </NotFoundContent>
+<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p>Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
 </Router>
diff --git a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/Blazor.IndexedDB.Framework.Example.csproj b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/Blazor.IndexedDB.Framework.Example.csproj
index fec2932..350f341 100644
--- a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/Blazor.IndexedDB.Framework.Example.csproj
+++ b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/Blazor.IndexedDB.Framework.Example.csproj
@@ -4,13 +4,14 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>7.3</LangVersion>
     <RazorLangVersion>3.0</RazorLangVersion>
+    <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview4.19579.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/Pages/Index.razor b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/Pages/Index.razor
index 1eb7945..b87997b 100644
--- a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/Pages/Index.razor
+++ b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/Pages/Index.razor
@@ -1,9 +1,9 @@
 @page "/"
 @inject IIndexedDbFactory DbFactory
 
-<button @onclick="@Create">Click me</button>
+<button  @onclick="@(e => Create(e))">Click me</button>
 @code{
-protected async Task Create()
+protected async Task Create(MouseEventArgs e)
 {
     using (var db = await this.DbFactory.Create<ExampleDb>())
     {
diff --git a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/_Imports.razor b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/_Imports.razor
index 719c449..1c6ca05 100644
--- a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/_Imports.razor
+++ b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/_Imports.razor
@@ -1,7 +1,7 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Layouts
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @using Blazor.IndexedDB.Framework.Example
 @using Blazor.IndexedDB.Framework.Example.Shared
diff --git a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/wwwroot/index.html b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/wwwroot/index.html
index df532a3..97d2046 100644
--- a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/wwwroot/index.html
+++ b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.Example/wwwroot/index.html
@@ -10,5 +10,6 @@
     <app>Loading...</app>
 
     <script src="_framework/blazor.webassembly.js"></script>
+    <script src="_content/indexedDb.Blazor.js"></script>
 </body>
 </html>
diff --git a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.csproj b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.csproj
index 42b5749..f00f7ff 100644
--- a/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.csproj
+++ b/src/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework/Blazor.IndexedDB.Framework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
 	  <OutputType>Library</OutputType>
     <IsPackable>true</IsPackable>
     <RazorLangVersion>3.0</RazorLangVersion>
@@ -21,8 +21,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview6.19307.2" />
-    <PackageReference Include="TG.Blazor.IndexedDB" Version="0.9.0-beta" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="TG.Blazor.IndexedDB" Version="1.2.1-preview" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="TG.Blazor.IndexedDB">
+      <HintPath>..\..\..\..\Blazor.IndexedDB\Blazor.IndexedDB\bin\Debug\netstandard2.1\TG.Blazor.IndexedDB.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
 </Project>