diff --git a/src/Joba.IBM.RPA.Cli/Joba.IBM.RPA.Cli.csproj b/src/Joba.IBM.RPA.Cli/Joba.IBM.RPA.Cli.csproj
index 4445b66..648603e 100644
--- a/src/Joba.IBM.RPA.Cli/Joba.IBM.RPA.Cli.csproj
+++ b/src/Joba.IBM.RPA.Cli/Joba.IBM.RPA.Cli.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<Company>Joba</Company>
diff --git a/src/Joba.IBM.RPA/Compiler/WalAnalyzer.cs b/src/Joba.IBM.RPA/Compiler/WalAnalyzer.cs
index cab3514..8fd7107 100644
--- a/src/Joba.IBM.RPA/Compiler/WalAnalyzer.cs
+++ b/src/Joba.IBM.RPA/Compiler/WalAnalyzer.cs
@@ -1,16 +1,13 @@
 using System.Text.RegularExpressions;
-using System.Xml.Linq;
 
 namespace Joba.IBM.RPA
 {
     internal sealed partial class WalAnalyzer
     {
-        private readonly WalParser parser = new WalParser();
+        private readonly WalParser parser = new();
 
-        internal WalAnalyzer(WalFile wal)
-        {
-            Lines = parser.Parse(wal.Content);
-        }
+        internal WalAnalyzer(WalFile wal) : this(wal.Content) { }
+        internal WalAnalyzer(WalContent content) => Lines = parser.Parse(content);
 
         internal WalLines Lines { get; }
 
diff --git a/src/Joba.IBM.RPA/Joba.IBM.RPA.csproj b/src/Joba.IBM.RPA/Joba.IBM.RPA.csproj
index 22fb778..06a3fab 100644
--- a/src/Joba.IBM.RPA/Joba.IBM.RPA.csproj
+++ b/src/Joba.IBM.RPA/Joba.IBM.RPA.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -15,12 +15,12 @@
 	<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
 	  <_Parameter1>$(AssemblyName).Tests</_Parameter1>
 	</AssemblyAttribute>
+	<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+		<_Parameter1>$(AssemblyName).Cli.Tests</_Parameter1>
+	</AssemblyAttribute>
 	<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
 	  <_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
 	</AssemblyAttribute>
-	  <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-		  <_Parameter1>Joba.IBM.RPA.Cli.Tests</_Parameter1>
-	  </AssemblyAttribute>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Snippets\InjectDependencies.definitions.snippet" />
diff --git a/src/Joba.IBM.RPA/Wal/WalFile.cs b/src/Joba.IBM.RPA/Wal/WalFile.cs
index 583f36a..0a0cb41 100644
--- a/src/Joba.IBM.RPA/Wal/WalFile.cs
+++ b/src/Joba.IBM.RPA/Wal/WalFile.cs
@@ -183,7 +183,7 @@ protected class WalFileProto
         }
     }
 
-    public struct WalContent
+    public readonly struct WalContent
     {
         private readonly string content;
 
@@ -194,7 +194,7 @@ public WalContent(string content)
         }
 
         public static WalContent Build(IEnumerable<string> lines) =>
-            new WalContent(string.Join(System.Environment.NewLine, lines));
+            new (string.Join(System.Environment.NewLine, lines));
 
         public override bool Equals([NotNullWhen(true)] object? obj)
         {
@@ -209,7 +209,7 @@ public override bool Equals([NotNullWhen(true)] object? obj)
         public static bool operator !=(WalContent left, WalContent right) => !(left == right);
     }
 
-    public struct WalVersion : IFormattable
+    public readonly struct WalVersion : IFormattable
     {
         private readonly int version;
 
@@ -238,7 +238,7 @@ public override bool Equals([NotNullWhen(true)] object? obj)
         public static bool operator <=(WalVersion left, WalVersion right) => left.version <= right.version;
     }
 
-    public struct WalFileName
+    public readonly struct WalFileName
     {
         private readonly string name;
 
diff --git a/src/Tests/Joba.IBM.RPA.Cli.Tests/Joba.IBM.RPA.Cli.Tests.csproj b/src/Tests/Joba.IBM.RPA.Cli.Tests/Joba.IBM.RPA.Cli.Tests.csproj
index 5d0e492..5c1ee04 100644
--- a/src/Tests/Joba.IBM.RPA.Cli.Tests/Joba.IBM.RPA.Cli.Tests.csproj
+++ b/src/Tests/Joba.IBM.RPA.Cli.Tests/Joba.IBM.RPA.Cli.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
diff --git a/src/Tests/Joba.IBM.RPA.Tests/Joba.IBM.RPA.Tests.csproj b/src/Tests/Joba.IBM.RPA.Tests/Joba.IBM.RPA.Tests.csproj
index 29fa26e..83e510c 100644
--- a/src/Tests/Joba.IBM.RPA.Tests/Joba.IBM.RPA.Tests.csproj
+++ b/src/Tests/Joba.IBM.RPA.Tests/Joba.IBM.RPA.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
 	  <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>