diff --git a/.runsettings b/.runsettings
new file mode 100644
index 000000000..70a060ed8
--- /dev/null
+++ b/.runsettings
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+
+  <RunConfiguration>
+    <ResultsDirectory>.\test_results</ResultsDirectory><!-- Path relative to solution directory -->
+    <TestSessionTimeout>60000</TestSessionTimeout><!-- Milliseconds -->
+  </RunConfiguration>
+
+  <Catch2Adapter disabled="false">
+    <CombinedTimeout>30000</CombinedTimeout><!-- 30s in Milliseconds -->
+    <DebugBreak>on</DebugBreak>
+    <FilenameFilter>-test</FilenameFilter>
+  </Catch2Adapter>
+
+</RunSettings>
\ No newline at end of file
diff --git a/applications/core_test/src/core_test/source.cpp b/applications/core_test/src/core_test/source.cpp
index 6f70879a1..f5c054fde 100644
--- a/applications/core_test/src/core_test/source.cpp
+++ b/applications/core_test/src/core_test/source.cpp
@@ -9,12 +9,12 @@ struct test_struct
 	int i = 14;
 };
 
-rsl::result<void> RYTHE_CCONV init_program(Program& program)
+rsl::result<void> RYTHE_CCONV init_program(program& program)
 {
-	auto& engine = program.addEngineInstance();
+	auto& engine = program.add_engine_instance();
 	engine.get_context().emplace<test_struct>().i = 15;
 
-    rsl::log::debug("{}", engine.get_context().get<test_struct>().i);
+	rsl::log::debug("{}", engine.get_context().get<test_struct>().i);
 
-    return rsl::error; // Temporarily to stop the engine from running.
+	return rsl::error; // Temporarily to stop the engine from running.
 }
diff --git a/applications/sandbox/src/sandbox/source.cpp b/applications/sandbox/src/sandbox/source.cpp
index 2e7c5557a..e097104ba 100644
--- a/applications/sandbox/src/sandbox/source.cpp
+++ b/applications/sandbox/src/sandbox/source.cpp
@@ -13,10 +13,10 @@ struct foo
 {
 };
 
-int RYTHE_CCONV reportModules(rythe::core::Program& program)
+rsl::result<void> RYTHE_CCONV init_program(rythe::core::program& program)
 {
 	using namespace rythe;
-	program.addEngineInstance();
+	program.add_engine_instance();
 
 	[[maybe_unused]] constexpr rsl::constexpr_string A = "Something";
 	[[maybe_unused]] constexpr rsl::constexpr_string B = "Other";
@@ -35,5 +35,5 @@ int RYTHE_CCONV reportModules(rythe::core::Program& program)
 		shrunk.capacity()
 	);
 
-	return -1;
+	return rsl::okay;
 }
diff --git a/build/vs2022/.runsettings b/build/vs2022/.runsettings
new file mode 100644
index 000000000..70a060ed8
--- /dev/null
+++ b/build/vs2022/.runsettings
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+
+  <RunConfiguration>
+    <ResultsDirectory>.\test_results</ResultsDirectory><!-- Path relative to solution directory -->
+    <TestSessionTimeout>60000</TestSessionTimeout><!-- Milliseconds -->
+  </RunConfiguration>
+
+  <Catch2Adapter disabled="false">
+    <CombinedTimeout>30000</CombinedTimeout><!-- 30s in Milliseconds -->
+    <DebugBreak>on</DebugBreak>
+    <FilenameFilter>-test</FilenameFilter>
+  </Catch2Adapter>
+
+</RunSettings>
\ No newline at end of file
diff --git a/libraries/rythe/rythe-standard-library b/libraries/rythe/rythe-standard-library
index d4fb0ead7..abb89ed64 160000
--- a/libraries/rythe/rythe-standard-library
+++ b/libraries/rythe/rythe-standard-library
@@ -1 +1 @@
-Subproject commit d4fb0ead7292463a345ccdf45d028b97247bb411
+Subproject commit abb89ed64d9ed7a5d308c69082009b7720370d43
diff --git a/modules/rythe/core b/modules/rythe/core
index 64574ff33..c9315757b 160000
--- a/modules/rythe/core
+++ b/modules/rythe/core
@@ -1 +1 @@
-Subproject commit 64574ff33c4e27d16e6d3006a5b344ddc9ec85ac
+Subproject commit c9315757bb41550b82a0a216038a3f74777c0e47
diff --git a/premake/rythe b/premake/rythe
index bebc9e3f8..e7edda85b 160000
--- a/premake/rythe
+++ b/premake/rythe
@@ -1 +1 @@
-Subproject commit bebc9e3f8dc5bbd01153553de2ec31a51a5902c6
+Subproject commit e7edda85ba7eb620a028243e56b4726e6a6bdd93
diff --git a/premake5.lua b/premake5.lua
index af425e147..17cec3d4a 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -1,8 +1,3 @@
--- root workspace, all sub-project should be included
-workspace "rythe"
-    location("build/" .. _ACTION)
-    configurations { "Debug", "Debug-no-inline", "Development", "Release", "Debug-asan", "Release-profiling" }
-
 os.chdir(_MAIN_SCRIPT_DIR)
 
 filter("configurations:Debug-no-inline")
@@ -10,4 +5,10 @@ filter("configurations:Debug-no-inline")
 
 local r = require("premake/rythe")
 
-r.configure()
\ No newline at end of file
+local workspace = {
+    name = "rythe",
+    location = "build/" .. _ACTION,
+    configurations = { "Debug", "Debug-no-inline", "Development", "Release", "Debug-asan", "Release-profiling" }
+}
+
+r.configure({workspace})
\ No newline at end of file