diff --git a/OmsiExtensions.sln b/OmsiExtensions.sln
index fd2db97..90dac8b 100644
--- a/OmsiExtensions.sln
+++ b/OmsiExtensions.sln
@@ -28,70 +28,77 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
+		Examples|x86 = Examples|x86
 		Release|x86 = Release|x86
 		ReleaseAndDocs|x86 = ReleaseAndDocs|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2E750CBE-F868-4AB7-96C2-27560F53E06B}.Debug|x86.ActiveCfg = Debug|x86
 		{2E750CBE-F868-4AB7-96C2-27560F53E06B}.Debug|x86.Build.0 = Debug|x86
+		{2E750CBE-F868-4AB7-96C2-27560F53E06B}.Examples|x86.ActiveCfg = Examples|x86
 		{2E750CBE-F868-4AB7-96C2-27560F53E06B}.Release|x86.ActiveCfg = Release|x86
 		{2E750CBE-F868-4AB7-96C2-27560F53E06B}.Release|x86.Build.0 = Release|x86
 		{2E750CBE-F868-4AB7-96C2-27560F53E06B}.ReleaseAndDocs|x86.ActiveCfg = ReleaseAndDocs|x86
 		{2E750CBE-F868-4AB7-96C2-27560F53E06B}.ReleaseAndDocs|x86.Build.0 = ReleaseAndDocs|x86
 		{28DA0165-EAA7-4171-A065-319409682BD1}.Debug|x86.ActiveCfg = Debug|x86
 		{28DA0165-EAA7-4171-A065-319409682BD1}.Debug|x86.Build.0 = Debug|x86
+		{28DA0165-EAA7-4171-A065-319409682BD1}.Examples|x86.ActiveCfg = Examples|x86
 		{28DA0165-EAA7-4171-A065-319409682BD1}.Release|x86.ActiveCfg = Release|x86
 		{28DA0165-EAA7-4171-A065-319409682BD1}.Release|x86.Build.0 = Release|x86
 		{28DA0165-EAA7-4171-A065-319409682BD1}.ReleaseAndDocs|x86.ActiveCfg = Release|x86
 		{28DA0165-EAA7-4171-A065-319409682BD1}.ReleaseAndDocs|x86.Build.0 = Release|x86
 		{FDA9A525-9722-46D3-B80C-8D2A76ABCA2D}.Debug|x86.ActiveCfg = Debug|x86
 		{FDA9A525-9722-46D3-B80C-8D2A76ABCA2D}.Debug|x86.Build.0 = Debug|x86
+		{FDA9A525-9722-46D3-B80C-8D2A76ABCA2D}.Examples|x86.ActiveCfg = Examples|x86
 		{FDA9A525-9722-46D3-B80C-8D2A76ABCA2D}.Release|x86.ActiveCfg = Release|x86
 		{FDA9A525-9722-46D3-B80C-8D2A76ABCA2D}.Release|x86.Build.0 = Release|x86
 		{FDA9A525-9722-46D3-B80C-8D2A76ABCA2D}.ReleaseAndDocs|x86.ActiveCfg = Release|x86
 		{FDA9A525-9722-46D3-B80C-8D2A76ABCA2D}.ReleaseAndDocs|x86.Build.0 = Release|x86
 		{D5CA6EEA-D436-456E-BCA5-34C3DFD5BFC7}.Debug|x86.ActiveCfg = Debug|x86
 		{D5CA6EEA-D436-456E-BCA5-34C3DFD5BFC7}.Debug|x86.Build.0 = Debug|x86
+		{D5CA6EEA-D436-456E-BCA5-34C3DFD5BFC7}.Examples|x86.ActiveCfg = Examples|x86
 		{D5CA6EEA-D436-456E-BCA5-34C3DFD5BFC7}.Release|x86.ActiveCfg = Release|x86
 		{D5CA6EEA-D436-456E-BCA5-34C3DFD5BFC7}.Release|x86.Build.0 = Release|x86
 		{D5CA6EEA-D436-456E-BCA5-34C3DFD5BFC7}.ReleaseAndDocs|x86.ActiveCfg = Release|x86
 		{D5CA6EEA-D436-456E-BCA5-34C3DFD5BFC7}.ReleaseAndDocs|x86.Build.0 = Release|x86
 		{CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.Debug|x86.ActiveCfg = Debug|Win32
 		{CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.Debug|x86.Build.0 = Debug|Win32
+		{CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.Examples|x86.ActiveCfg = Examples|Win32
 		{CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.Release|x86.ActiveCfg = Release|Win32
 		{CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.Release|x86.Build.0 = Release|Win32
 		{CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.ReleaseAndDocs|x86.ActiveCfg = Release|Win32
 		{CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.ReleaseAndDocs|x86.Build.0 = Release|Win32
 		{CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Debug|x86.ActiveCfg = Debug|x86
 		{CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Debug|x86.Build.0 = Debug|x86
+		{CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Examples|x86.ActiveCfg = Examples|x86
 		{CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Release|x86.ActiveCfg = Release|x86
 		{CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Release|x86.Build.0 = Release|x86
 		{CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.ReleaseAndDocs|x86.ActiveCfg = Release|x86
 		{CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.ReleaseAndDocs|x86.Build.0 = Release|x86
 		{BA833C68-E8BD-4C86-9555-85542DF02015}.Debug|x86.ActiveCfg = Debug|x86
 		{BA833C68-E8BD-4C86-9555-85542DF02015}.Debug|x86.Build.0 = Debug|x86
+		{BA833C68-E8BD-4C86-9555-85542DF02015}.Examples|x86.ActiveCfg = Examples|x86
+		{BA833C68-E8BD-4C86-9555-85542DF02015}.Examples|x86.Build.0 = Examples|x86
 		{BA833C68-E8BD-4C86-9555-85542DF02015}.Release|x86.ActiveCfg = Release|x86
-		{BA833C68-E8BD-4C86-9555-85542DF02015}.Release|x86.Build.0 = Release|x86
 		{BA833C68-E8BD-4C86-9555-85542DF02015}.ReleaseAndDocs|x86.ActiveCfg = Release|x86
-		{BA833C68-E8BD-4C86-9555-85542DF02015}.ReleaseAndDocs|x86.Build.0 = Release|x86
 		{47659503-9923-4E74-AD26-103C1F9FF2B0}.Debug|x86.ActiveCfg = Debug|x86
 		{47659503-9923-4E74-AD26-103C1F9FF2B0}.Debug|x86.Build.0 = Debug|x86
+		{47659503-9923-4E74-AD26-103C1F9FF2B0}.Examples|x86.ActiveCfg = Examples|x86
+		{47659503-9923-4E74-AD26-103C1F9FF2B0}.Examples|x86.Build.0 = Examples|x86
 		{47659503-9923-4E74-AD26-103C1F9FF2B0}.Release|x86.ActiveCfg = Release|x86
-		{47659503-9923-4E74-AD26-103C1F9FF2B0}.Release|x86.Build.0 = Release|x86
 		{47659503-9923-4E74-AD26-103C1F9FF2B0}.ReleaseAndDocs|x86.ActiveCfg = Release|x86
-		{47659503-9923-4E74-AD26-103C1F9FF2B0}.ReleaseAndDocs|x86.Build.0 = Release|x86
 		{1DF326AE-4D10-4545-B36A-5622B76987EC}.Debug|x86.ActiveCfg = Debug|x86
 		{1DF326AE-4D10-4545-B36A-5622B76987EC}.Debug|x86.Build.0 = Debug|x86
+		{1DF326AE-4D10-4545-B36A-5622B76987EC}.Examples|x86.ActiveCfg = Examples|x86
+		{1DF326AE-4D10-4545-B36A-5622B76987EC}.Examples|x86.Build.0 = Examples|x86
 		{1DF326AE-4D10-4545-B36A-5622B76987EC}.Release|x86.ActiveCfg = Release|x86
-		{1DF326AE-4D10-4545-B36A-5622B76987EC}.Release|x86.Build.0 = Release|x86
 		{1DF326AE-4D10-4545-B36A-5622B76987EC}.ReleaseAndDocs|x86.ActiveCfg = Release|x86
-		{1DF326AE-4D10-4545-B36A-5622B76987EC}.ReleaseAndDocs|x86.Build.0 = Release|x86
 		{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}.Debug|x86.ActiveCfg = Debug|x86
 		{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}.Debug|x86.Build.0 = Debug|x86
+		{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}.Examples|x86.ActiveCfg = Examples|x86
+		{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}.Examples|x86.Build.0 = Examples|x86
 		{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}.Release|x86.ActiveCfg = Release|x86
-		{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}.Release|x86.Build.0 = Release|x86
 		{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}.ReleaseAndDocs|x86.ActiveCfg = Release|x86
-		{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}.ReleaseAndDocs|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/OmsiExtensionsCLI/OmsiExtensionsCLI.csproj b/OmsiExtensionsCLI/OmsiExtensionsCLI.csproj
index 0bfd17a..da935e8 100644
--- a/OmsiExtensionsCLI/OmsiExtensionsCLI.csproj
+++ b/OmsiExtensionsCLI/OmsiExtensionsCLI.csproj
@@ -6,6 +6,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <Platforms>x86</Platforms>
 	<ApplicationIcon>favicon.ico</ApplicationIcon>
+	<Configurations>Debug;Release;Examples</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/OmsiExtensionsUI/OmsiExtensionsUI.csproj b/OmsiExtensionsUI/OmsiExtensionsUI.csproj
index ced68a6..e884512 100644
--- a/OmsiExtensionsUI/OmsiExtensionsUI.csproj
+++ b/OmsiExtensionsUI/OmsiExtensionsUI.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
 	<Platforms>x86</Platforms>
+	<Configurations>Debug;Release;Examples</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
diff --git a/OmsiHook/OmsiHook.csproj b/OmsiHook/OmsiHook.csproj
index b97d414..dd09f15 100644
--- a/OmsiHook/OmsiHook.csproj
+++ b/OmsiHook/OmsiHook.csproj
@@ -22,7 +22,7 @@
 		<Nullable>disable</Nullable>
 		<Platforms>x86</Platforms>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
-		<Configurations>Debug;Release;ReleaseAndDocs</Configurations>
+		<Configurations>Debug;Release;ReleaseAndDocs;Examples</Configurations>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" />
diff --git a/OmsiHookInvoker/OmsiHookInvoker.vcxproj b/OmsiHookInvoker/OmsiHookInvoker.vcxproj
index 05d662f..82565d9 100644
--- a/OmsiHookInvoker/OmsiHookInvoker.vcxproj
+++ b/OmsiHookInvoker/OmsiHookInvoker.vcxproj
@@ -5,6 +5,10 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Examples|Win32">
+      <Configuration>Examples</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -31,6 +35,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Examples|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -42,6 +53,9 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Examples|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -49,6 +63,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Examples|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -89,6 +106,30 @@
       </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Examples|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;OMSIHOOKINVOKER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="DXHook.h" />
     <ClInclude Include="framework.h" />
@@ -103,6 +144,7 @@
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Examples|Win32'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/OmsiHookInvoker/OmsiHookInvoker.vcxproj.filters b/OmsiHookInvoker/OmsiHookInvoker.vcxproj.filters
index 0028927..c2457aa 100644
--- a/OmsiHookInvoker/OmsiHookInvoker.vcxproj.filters
+++ b/OmsiHookInvoker/OmsiHookInvoker.vcxproj.filters
@@ -27,6 +27,9 @@
     <ClInclude Include="OmsiHookRPCErrors.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="FunctionHooks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -38,5 +41,8 @@
     <ClCompile Include="DXHook.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="FunctionHooks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OmsiHookPlugin/OmsiHookPlugin.cs b/OmsiHookPlugin/OmsiHookPlugin.cs
index 7d15fa0..ac1cf40 100644
--- a/OmsiHookPlugin/OmsiHookPlugin.cs
+++ b/OmsiHookPlugin/OmsiHookPlugin.cs
@@ -52,7 +52,7 @@ private static void Hook_OnOmsiExited(object sender, EventArgs e)
             Log($"Omsi exited!");
         }
 
-        private static void Hook_OnMapChange(object sender, EventArgs e)
+        private static void Hook_OnMapChange(object sender, OmsiMap e)
         {
             Log($"Map changed!");
         }
diff --git a/OmsiHookPlugin/OmsiHookPlugin.csproj b/OmsiHookPlugin/OmsiHookPlugin.csproj
index 103edf6..5e1a870 100644
--- a/OmsiHookPlugin/OmsiHookPlugin.csproj
+++ b/OmsiHookPlugin/OmsiHookPlugin.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
     <Platforms>x86</Platforms>
+    <Configurations>Debug;Release;Examples</Configurations>
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
diff --git a/OmsiHookRPCPlugin/OmsiHookRPCPlugin.csproj b/OmsiHookRPCPlugin/OmsiHookRPCPlugin.csproj
index 30059cc..00b157c 100644
--- a/OmsiHookRPCPlugin/OmsiHookRPCPlugin.csproj
+++ b/OmsiHookRPCPlugin/OmsiHookRPCPlugin.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
     <Platforms>AnyCPU;x86</Platforms>
+    <Configurations>Debug;Release;Examples</Configurations>
   </PropertyGroup>
   <PropertyGroup>
 	  <Authors>Thomas Mathieson</Authors>
diff --git a/_OmsiHookExamples/BasicCLI/BasicCLI.csproj b/_OmsiHookExamples/BasicCLI/BasicCLI.csproj
index c66fed0..4e84637 100644
--- a/_OmsiHookExamples/BasicCLI/BasicCLI.csproj
+++ b/_OmsiHookExamples/BasicCLI/BasicCLI.csproj
@@ -7,6 +7,7 @@
     <Nullable>enable</Nullable>
     <Platforms>x86</Platforms>
     <StartupObject>BasicCLI.Program</StartupObject>
+    <Configurations>Debug;Release;Examples</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/_OmsiHookExamples/EventSample/EventSample.csproj b/_OmsiHookExamples/EventSample/EventSample.csproj
index 1b40390..d93b426 100644
--- a/_OmsiHookExamples/EventSample/EventSample.csproj
+++ b/_OmsiHookExamples/EventSample/EventSample.csproj
@@ -8,6 +8,7 @@
     <StartupObject>EventSample.Program</StartupObject>
     <PlatformTarget>x86</PlatformTarget>
     <Platforms>x86</Platforms>
+    <Configurations>Debug;Release;Examples</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/_OmsiHookExamples/TriggersSample/TriggersSample.csproj b/_OmsiHookExamples/TriggersSample/TriggersSample.csproj
index 1ee32ba..ab02237 100644
--- a/_OmsiHookExamples/TriggersSample/TriggersSample.csproj
+++ b/_OmsiHookExamples/TriggersSample/TriggersSample.csproj
@@ -8,6 +8,7 @@
     <StartupObject>TriggersSample.Program</StartupObject>
     <PlatformTarget>x86</PlatformTarget>
     <Platforms>x86</Platforms>
+    <Configurations>Debug;Release;Examples</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/_OmsiHookExamples/VideoDemo/VideoDemo.csproj b/_OmsiHookExamples/VideoDemo/VideoDemo.csproj
index a9498e9..8811da8 100644
--- a/_OmsiHookExamples/VideoDemo/VideoDemo.csproj
+++ b/_OmsiHookExamples/VideoDemo/VideoDemo.csproj
@@ -8,6 +8,7 @@
     <StartupObject>VideoDemo.Program</StartupObject>
     <PlatformTarget>x86</PlatformTarget>
 	<Platforms>x86</Platforms>
+	<Configurations>Debug;Release;Examples</Configurations>
   </PropertyGroup>
 
   <ItemGroup>