diff --git a/.editorconfig b/.editorconfig
index 0f27dd6..15be9f6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -274,6 +274,8 @@ dotnet_diagnostic.SA1108.severity = silent
 dotnet_diagnostic.SA1012.severity = error
 dotnet_diagnostic.SA1500.severity = error
 dotnet_diagnostic.SA1316.severity = error
+csharp_prefer_system_threading_lock = true:suggestion
+dotnet_diagnostic.MA0132.severity = error
 
 [*.{cs,vb}]
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
diff --git a/Analogy.LogViewer.Example/Analogy.LogViewer.Example.csproj b/Analogy.LogViewer.Example/Analogy.LogViewer.Example.csproj
index 8b13178..b138cd7 100644
--- a/Analogy.LogViewer.Example/Analogy.LogViewer.Example.csproj
+++ b/Analogy.LogViewer.Example/Analogy.LogViewer.Example.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net9.0-windows;net8.0-windows;net48</TargetFrameworks>
 		<VersionPrefix>8.0.0.0</VersionPrefix>
-		<VersionSuffix>a1</VersionSuffix>
+		<VersionSuffix>a2</VersionSuffix>
 		<Authors>Lior Banai</Authors>
 		<Company>Analogy.LogViewer</Company>
 		<Product>Analogy.LogViewer.Example</Product>
@@ -20,9 +20,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0-a2" />
-		<PackageReference Include="Analogy.CommonUtilities" Version="8.0.0-a1" />
-		<PackageReference Include="Analogy.LogViewer.Template" Version="8.0.0-a1" />
+		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0" />
+		<PackageReference Include="Analogy.CommonUtilities" Version="8.0.0" />
+		<PackageReference Include="Analogy.LogViewer.Template" Version="8.0.0" />
 		<PackageReference Include="System.Resources.Extensions" Version="9.0.1" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/Analogy.LogViewer.Example/IAnalogy/ExampleOnDemandPlotting.cs b/Analogy.LogViewer.Example/IAnalogy/ExampleOnDemandPlotting.cs
index aea8e51..aea1ee2 100644
--- a/Analogy.LogViewer.Example/IAnalogy/ExampleOnDemandPlotting.cs
+++ b/Analogy.LogViewer.Example/IAnalogy/ExampleOnDemandPlotting.cs
@@ -29,7 +29,7 @@ public Task InitializeOnDemandPlotting(IAnalogyOnDemandPlottingInteractor onDema
 
         private void SimulateData_Tick(object sender, EventArgs e)
         {
-            var now = DateTime.Now;
+            var now = DateTimeOffset.Now;
             AnalogyPlottingPointData d1 = new AnalogyPlottingPointData("series1", GenerateValue(counter), now);
             AnalogyPlottingPointData d2 = new AnalogyPlottingPointData("series2", GenerateValue(counter + 50), now);
             var list = new List<AnalogyPlottingPointData>(2) { d1, d2 };
diff --git a/Analogy.LogViewer.Example/IAnalogy/ExamplePlotting.cs b/Analogy.LogViewer.Example/IAnalogy/ExamplePlotting.cs
index 92c5fb7..dbf4e32 100644
--- a/Analogy.LogViewer.Example/IAnalogy/ExamplePlotting.cs
+++ b/Analogy.LogViewer.Example/IAnalogy/ExamplePlotting.cs
@@ -46,7 +46,7 @@ public Task StopPlotting()
 
         private void SimulateData_Tick(object sender, EventArgs e)
         {
-            var now = DateTime.Now;
+            var now = DateTimeOffset.Now;
             AnalogyPlottingPointData d1 = new AnalogyPlottingPointData("series1", GenerateValue(counter), now);
             OnNewPointData?.Invoke(this, d1);
             AnalogyPlottingPointData d2 = new AnalogyPlottingPointData("series2", GenerateValue(counter + 50), now);
diff --git a/Analogy.LogViewer.Example/IAnalogy/ServerSidePagingProvider.cs b/Analogy.LogViewer.Example/IAnalogy/ServerSidePagingProvider.cs
index 761f591..9f34ebc 100644
--- a/Analogy.LogViewer.Example/IAnalogy/ServerSidePagingProvider.cs
+++ b/Analogy.LogViewer.Example/IAnalogy/ServerSidePagingProvider.cs
@@ -51,8 +51,8 @@ public override Task<IEnumerable<IAnalogyLogMessage>> FetchMessages(int pageNumb
             ILogMessageCreatedHandler messagesHandler)
         {
             var filters = messages.Where(m =>
-                m.Date >= (filterCriteria.StartTime ?? DateTime.MinValue)
-                && m.Date <= (filterCriteria.EndTime ?? DateTime.MaxValue));
+                m.Date >= (filterCriteria.StartTime ?? DateTimeOffset.MinValue)
+                && m.Date <= (filterCriteria.EndTime ?? DateTimeOffset.MaxValue));
 
             foreach (var include in filterCriteria.IncludeText)
             {