diff --git a/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj b/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj
index e881480..f2b7318 100644
--- a/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj
+++ b/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <AssemblyTitle>LoadModules.Extensions.AutomationPlugins</AssemblyTitle>
diff --git a/Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj b/Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj
index 7d35709..b55c6e4 100644
--- a/Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj
+++ b/Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/LoadModules.Extensions.Tests/LoadModules - Backup.Extensions.Tests.csproj b/LoadModules.Extensions.Tests/LoadModules - Backup.Extensions.Tests.csproj
new file mode 100644
index 0000000..1bdadce
--- /dev/null
+++ b/LoadModules.Extensions.Tests/LoadModules - Backup.Extensions.Tests.csproj	
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ProjectGuid>{A6987FAF-E280-48C8-B50D-17FF34924E1D}</ProjectGuid>
+    <TargetFramework>net7.0-windows</TargetFramework>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <AssemblyTitle>LoadModules.Extensions.Tests</AssemblyTitle>
+    <Product>LoadModules.Extensions.Tests</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.0.131" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AutomationPlugins\LoadModules.Extensions.AutomationPlugins\LoadModules.Extensions.AutomationPlugins.csproj" />
+    <ProjectReference Include="..\Interactive\LoadModules.Extensions.Interactive\LoadModules.Extensions.Interactive.csproj" />
+    <ProjectReference Include="..\Python\LoadModules.Extensions.Python\LoadModules.Extensions.Python.csproj" />
+    <ProjectReference Include="..\RDMP\Tests.Common\Tests.Common.csproj" />
+    <ProjectReference Include="..\ReleasePlugins\LoadModules.Extensions.ReleasePlugins\LoadModules.Extensions.ReleasePlugins.csproj" />
+    <ProjectReference Include="..\StatsScriptsExecution\LoadModules.Extensions.StatsScriptsExecution\LoadModules.Extensions.StatsScriptsExecution.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="TestDatabases.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
index 15dd949..1bdadce 100644
--- a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
+++ b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
@@ -1,43 +1,37 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ProjectGuid>{A6987FAF-E280-48C8-B50D-17FF34924E1D}</ProjectGuid>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <AssemblyTitle>LoadModules.Extensions.Tests</AssemblyTitle>
-    <Product>LoadModules.Extensions.Tests</Product>
-    <Copyright>Copyright ©  2019</Copyright>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <ItemGroup>
-    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\hic.rdmp.plugin.test\8.1.0-rc1\contentFiles\any\net6.0\testhost.dll" />
-    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\hic.rdmp.plugin.test\8.1.0-rc1\contentFiles\any\net6.0\testhost.exe" />
-    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\microsoft.testplatform.testhost\17.5.0\build\netcoreapp3.1\x64\testhost.dll" />
-    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\microsoft.testplatform.testhost\17.5.0\build\netcoreapp3.1\x64\testhost.exe" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.131" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\AutomationPlugins\LoadModules.Extensions.AutomationPlugins\LoadModules.Extensions.AutomationPlugins.csproj" />
-    <ProjectReference Include="..\Interactive\LoadModules.Extensions.Interactive\LoadModules.Extensions.Interactive.csproj" />
-    <ProjectReference Include="..\Python\LoadModules.Extensions.Python\LoadModules.Extensions.Python.csproj" />
-    <ProjectReference Include="..\RDMP\Tests.Common\Tests.Common.csproj" />
-    <ProjectReference Include="..\ReleasePlugins\LoadModules.Extensions.ReleasePlugins\LoadModules.Extensions.ReleasePlugins.csproj" />
-    <ProjectReference Include="..\StatsScriptsExecution\LoadModules.Extensions.StatsScriptsExecution\LoadModules.Extensions.StatsScriptsExecution.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="TestDatabases.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ProjectGuid>{A6987FAF-E280-48C8-B50D-17FF34924E1D}</ProjectGuid>
+    <TargetFramework>net7.0-windows</TargetFramework>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <AssemblyTitle>LoadModules.Extensions.Tests</AssemblyTitle>
+    <Product>LoadModules.Extensions.Tests</Product>
+    <Copyright>Copyright ©  2019</Copyright>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.0.131" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AutomationPlugins\LoadModules.Extensions.AutomationPlugins\LoadModules.Extensions.AutomationPlugins.csproj" />
+    <ProjectReference Include="..\Interactive\LoadModules.Extensions.Interactive\LoadModules.Extensions.Interactive.csproj" />
+    <ProjectReference Include="..\Python\LoadModules.Extensions.Python\LoadModules.Extensions.Python.csproj" />
+    <ProjectReference Include="..\RDMP\Tests.Common\Tests.Common.csproj" />
+    <ProjectReference Include="..\ReleasePlugins\LoadModules.Extensions.ReleasePlugins\LoadModules.Extensions.ReleasePlugins.csproj" />
+    <ProjectReference Include="..\StatsScriptsExecution\LoadModules.Extensions.StatsScriptsExecution\LoadModules.Extensions.StatsScriptsExecution.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="TestDatabases.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Plugin/main/main.csproj b/Plugin/main/main.csproj
index 5cda572..9c3af33 100644
--- a/Plugin/main/main.csproj
+++ b/Plugin/main/main.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyTitle>Rdmp.Extensions.Plugin</AssemblyTitle>
     <Product>Rdmp.Extensions.Plugin</Product>
     <Copyright>Copyright ©  2019</Copyright>
diff --git a/Plugin/windows/windows.csproj b/Plugin/windows/windows.csproj
index aa7950c..0e28647 100644
--- a/Plugin/windows/windows.csproj
+++ b/Plugin/windows/windows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{07F9F874-1306-4FE6-A03F-A483592BBC7F}</ProjectGuid>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <AssemblyTitle>Rdmp.Extensions.Plugin</AssemblyTitle>
     <Product>Rdmp.Extensions.Plugin</Product>
     <Copyright>Copyright ©  2019</Copyright>
diff --git a/Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj b/Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj
index 390b620..74283e4 100644
--- a/Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj
+++ b/Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>    
+    <TargetFramework>net7.0</TargetFramework>    
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
     <AssemblyTitle>LoadModules.Extensions</AssemblyTitle>
diff --git a/RDMP b/RDMP
index 911f239..0150a31 160000
--- a/RDMP
+++ b/RDMP
@@ -1 +1 @@
-Subproject commit 911f239f027c5d14fac74eb672227a63bf274de1
+Subproject commit 0150a31ef56e94b0d75afa0887914bc959063eab
diff --git a/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj b/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj
index 8dc530d..6e9d915 100644
--- a/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj
+++ b/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyTitle>LoadModules.Extensions.ReleasePlugins</AssemblyTitle>
     <Product>LoadModules.Extensions.ReleasePlugins</Product>
diff --git a/StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj b/StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj
index 6c1758d..255158d 100644
--- a/StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj
+++ b/StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyTitle>LoadModules.Extensions.StatsScriptsExecution</AssemblyTitle>
     <Product>LoadModules.Extensions.StatsScriptsExecution</Product>
     <Copyright>Copyright ©  2018</Copyright>