diff --git a/LiteDB.Benchmarks/Program.cs b/LiteDB.Benchmarks/Program.cs
index 334c15a68..3d4640a7a 100644
--- a/LiteDB.Benchmarks/Program.cs
+++ b/LiteDB.Benchmarks/Program.cs
@@ -15,9 +15,9 @@ static void Main(string[] args)
             BenchmarkRunner.Run(typeof(Program).Assembly, DefaultConfig.Instance
                 //.With(new BenchmarkDotNet.Filters.AnyCategoriesFilter(new[] { Benchmarks.Constants.Categories.GENERAL }))
                 //.AddFilter(new BenchmarkDotNet.Filters.AnyCategoriesFilter([Benchmarks.Constants.Categories.GENERAL]))
-                .AddJob(Job.Default.WithRuntime(CoreRuntime.Core60)
+                .AddJob(Job.Default.WithRuntime(CoreRuntime.Core80)
                     .WithJit(Jit.RyuJit)
-                    .WithToolchain(CsProjCoreToolchain.NetCoreApp60)
+                    .WithToolchain(CsProjCoreToolchain.NetCoreApp80)
                     .WithGcForce(true))
                 /*.With(Job.Default.With(MonoRuntime.Default)
                     .With(Jit.Llvm)
diff --git a/LiteDB.Stress/Examples/test-01.xml b/LiteDB.Stress/Examples/test-01.xml
index f0f58ab93..6e90af110 100644
--- a/LiteDB.Stress/Examples/test-01.xml
+++ b/LiteDB.Stress/Examples/test-01.xml
@@ -9,9 +9,9 @@
     <updateDate type="date" range="1960-01-01~2018-12-31" />
     <jsonData>{ myItem: 'abc', array: [1, 2, 3] }</jsonData>
   </insert>
-  <task name="UPDATE" sleep="8s">UPDATE col1 SET name = UPPER(name), large=LPAD(name, RANDOM(50, 3000), 'x')</task>
-  <task name="DELETE" sleep="45s">DELETE col1 WHERE 1 = 1</task>
+  <task name="UPDATE" sleep="10s">UPDATE col1 SET name = UPPER(name), large=LPAD(name, RANDOM(50, 3000), 'x')</task>
+  <task name="DELETE" sleep="10s">DELETE col1 WHERE 1 = 1</task>
   <task name="CHECKPOINT" sleep="10s">CHECKPOINT</task>
-  <task name="COUNT" sleep="1s">SELECT COUNT(*) FROM col1</task>
-  <task name="SIZE" sleep="1s">SELECT { data: FORMAT(dataFileSize, 'n0'), log: FORMAT(logFileSize, 'n0') } FROM $database</task>
+  <task name="COUNT" sleep="10s">SELECT COUNT(*) FROM col1</task>
+  <task name="SIZE" sleep="10s">SELECT { data: FORMAT(dataFileSize, 'n0'), log: FORMAT(logFileSize, 'n0') } FROM $database</task>
 </test>
\ No newline at end of file
diff --git a/LiteDB.Stress/LiteDB.Stress.csproj b/LiteDB.Stress/LiteDB.Stress.csproj
index 52c55f808..f34f8fcb8 100644
--- a/LiteDB.Stress/LiteDB.Stress.csproj
+++ b/LiteDB.Stress/LiteDB.Stress.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LiteDB.Stress/Properties/launchSettings.json b/LiteDB.Stress/Properties/launchSettings.json
index e848c69a2..5c3bc9f6d 100644
--- a/LiteDB.Stress/Properties/launchSettings.json
+++ b/LiteDB.Stress/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "LiteDB.Stress": {
       "commandName": "Project",
-      "commandLineArgs": "../../../Examples/test-02.xml"
+      "commandLineArgs": "../../../Examples/test-01.xml"
     }
   }
 }
\ No newline at end of file
diff --git a/LiteDB.Stress/Test/InsertTaskItem.cs b/LiteDB.Stress/Test/InsertTaskItem.cs
index f17a40f55..fa0b2cc95 100644
--- a/LiteDB.Stress/Test/InsertTaskItem.cs
+++ b/LiteDB.Stress/Test/InsertTaskItem.cs
@@ -41,26 +41,23 @@ public InsertTaskItem(XmlElement el)
 
         public BsonValue Execute(LiteDatabase db)
         {
-            IEnumerable<BsonDocument> source()
-            {
-                var count = _rnd.Next(this.MinRange, this.MaxRange);
+            _collection ??= db.GetCollection(this.Collection, this.AutoId);
 
-                for(var i = 0; i < count; i++)
-                {
-                    var doc = new BsonDocument();
+            var count = _rnd.Next(this.MinRange, this.MaxRange);
 
-                    foreach(var field in this.Fields)
-                    {
-                        doc[field.Name] = field.GetValue();
-                    }
+            for(var i = 0; i < count; i++)
+            {
+                var doc = new BsonDocument();
 
-                    yield return doc;
+                foreach(var field in this.Fields)
+                {
+                    doc[field.Name] = field.GetValue();
                 }
-            }
 
-            _collection ??= db.GetCollection(this.Collection, this.AutoId);
+                _collection.Insert(doc);
+            }
 
-            return _collection.Insert(source());
+            return count;
         }
     }
 }
diff --git a/LiteDB.Tests/LiteDB.Tests.csproj b/LiteDB.Tests/LiteDB.Tests.csproj
index 831a78701..faed46f9b 100644
--- a/LiteDB.Tests/LiteDB.Tests.csproj
+++ b/LiteDB.Tests/LiteDB.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <AssemblyName>LiteDB.Tests</AssemblyName>
     <RootNamespace>LiteDB.Tests</RootNamespace>
     <Authors>Maurício David</Authors>
diff --git a/LiteDB.sln b/LiteDB.sln
index 3f75c194f..848dbb661 100644
--- a/LiteDB.sln
+++ b/LiteDB.sln
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiteDB.Benchmarks", "LiteDB
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiteDB.Stress", "LiteDB.Stress\LiteDB.Stress.csproj", "{FFBC5669-DA32-4907-8793-7B414279DA3B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{E8763934-E46A-4AAF-A2B5-E812016DAF84}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +39,6 @@ Global
 		{FFBC5669-DA32-4907-8793-7B414279DA3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FFBC5669-DA32-4907-8793-7B414279DA3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFBC5669-DA32-4907-8793-7B414279DA3B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8763934-E46A-4AAF-A2B5-E812016DAF84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8763934-E46A-4AAF-A2B5-E812016DAF84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8763934-E46A-4AAF-A2B5-E812016DAF84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8763934-E46A-4AAF-A2B5-E812016DAF84}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/LiteDB/LiteDB.csproj b/LiteDB/LiteDB.csproj
index f889ceeeb..67eeb45f1 100644
--- a/LiteDB/LiteDB.csproj
+++ b/LiteDB/LiteDB.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <TargetFrameworks>net4.5;netstandard1.3;netstandard2.0</TargetFrameworks>
-    <AssemblyVersion>5.0.20</AssemblyVersion>
-    <FileVersion>5.0.20</FileVersion>
-    <VersionPrefix>5.0.20</VersionPrefix>
-    <PackageVersion>5.0.20</PackageVersion>
+    <AssemblyVersion>5.0.21</AssemblyVersion>
+    <FileVersion>5.0.21</FileVersion>
+    <VersionPrefix>5.0.21</VersionPrefix>
+    <PackageVersion>5.0.21</PackageVersion>
     <Authors>Maurício David</Authors>
     <Product>LiteDB</Product>
     <Description>LiteDB - A lightweight embedded .NET NoSQL document store in a single datafile</Description>