diff --git a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/GeneratePatchTargetHashes.xml b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/GeneratePatchTargetHashes.xml
index d30ce53..45c42dd 100644
--- a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/GeneratePatchTargetHashes.xml
+++ b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/GeneratePatchTargetHashes.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="GeneratePatchTargetHashes" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../../tools/GeneratePatchTargetHashes/bin/Release/netcoreapp3.1/GeneratePatchTargetHashes.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../../tools/GeneratePatchTargetHashes/bin/x64/Release/GeneratePatchTargetHashes.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../tools/GeneratePatchTargetHashes/bin/Release/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../tools/GeneratePatchTargetHashes/bin/x64/Release" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/GeneratePatchTargetHashes__No_Build_.xml b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/GeneratePatchTargetHashes__No_Build_.xml
new file mode 100644
index 0000000..111bc3d
--- /dev/null
+++ b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/GeneratePatchTargetHashes__No_Build_.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="GeneratePatchTargetHashes (No Build)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../../tools/GeneratePatchTargetHashes/bin/x64/Release/GeneratePatchTargetHashes.dll" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../tools/GeneratePatchTargetHashes/bin/x64/Release" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/../../tools/GeneratePatchTargetHashes/GeneratePatchTargetHashes.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL.xml b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL.xml
index f56787c..9b22cef 100644
--- a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL.xml
+++ b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="M&amp;B II: BL" type="RunExe" factoryName=".NET Executable" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../../../../bin/Win64_Shipping_Client/TaleWorlds.MountAndBlade.Launcher.exe" />
-    <option name="PROGRAM_PARAMETERS" value="/no-startup-dialog /diag /wfi /mfs" />
+    <option name="PROGRAM_PARAMETERS" value="/no-startup-dialog /diag" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../bin/Win64_Shipping_Client" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL__Direct_.xml b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL__Direct_.xml
new file mode 100644
index 0000000..2e0b8bb
--- /dev/null
+++ b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL__Direct_.xml
@@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="M&amp;B II: BL (Direct)" type="RunExe" factoryName=".NET Executable" activateToolWindowBeforeRun="false">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../../../../bin/Win64_Shipping_Client/Bannerlord.exe" />
+    <option name="PROGRAM_PARAMETERS" value="/singleplayer /no-startup-dialog /diag _MODULES_*Native*CommunityPatch*SandBoxCore*Sandbox*CustomBattle*StoryMode*_MODULES_" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../bin/Win64_Shipping_Client" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs>
+      <env name="COR_ENABLE_PROFILING" value="1" />
+      <env name="COR_PROFILER_PATH" value="$PROJECT_DIR$/../../../../bin/Win64_Shipping_Client/AntijankProfiler.dll" />
+      <env name="COR_PROFILER" value="{204AEE3C-CEE0-43D7-BFCA-6B0AFB22F09C}" />
+    </envs>
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build Solution" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL__No_Build_.xml b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL__No_Build_.xml
new file mode 100644
index 0000000..ae3f77a
--- /dev/null
+++ b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/M_B_II__BL__No_Build_.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="M&amp;B II: BL (No Build)" type="RunExe" factoryName=".NET Executable" activateToolWindowBeforeRun="false">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../../../../bin/Win64_Shipping_Client/TaleWorlds.MountAndBlade.Launcher.exe" />
+    <option name="PROGRAM_PARAMETERS" value="/diag" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../bin/Win64_Shipping_Client" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <envs>
+      <env name="ComPLUS_ReadyToRun" value="0" />
+      <env name="ComPLUS_JitMinOpts" value="1" />
+      <env name="ComPLUS_ZapDisable" value="1" />
+    </envs>
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/PackageRelease.xml b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/PackageRelease.xml
index ee94fe3..b714af6 100644
--- a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/PackageRelease.xml
+++ b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/PackageRelease.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="PackageRelease" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../../tools/PackageRelease/bin/Debug/netcoreapp3.1/PackageRelease.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../../tools/PackageRelease/bin/x64/Release/netcoreapp3.1/PackageRelease.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../tools/PackageRelease/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../tools/PackageRelease/bin/x64/Release/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/PackageRelease__No_Build_.xml b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/PackageRelease__No_Build_.xml
new file mode 100644
index 0000000..c31b97b
--- /dev/null
+++ b/src/CommunityPatch/.idea/.idea.CommunityPatch/.idea/runConfigurations/PackageRelease__No_Build_.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PackageRelease (No Build)" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../../tools/PackageRelease/bin/x64/Release/netcoreapp3.1/PackageRelease.dll" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../tools/PackageRelease/bin/x64/Release/netcoreapp3.1" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/../../tools/PackageRelease/PackageRelease.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/src/CommunityPatch/CommunityPatch.csproj b/src/CommunityPatch/CommunityPatch.csproj
index c392ea8..18b5ebf 100644
--- a/src/CommunityPatch/CommunityPatch.csproj
+++ b/src/CommunityPatch/CommunityPatch.csproj
@@ -23,11 +23,33 @@
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
+    <Choose>
+        <When Condition="'$(MnB2BannerlordRefAsmsVersion)'==''">
+            <ItemGroup>
+                <Reference Include="$(MnB2BannerlordBinDir)\TaleWorlds.*.dll" Exclude="$(MnB2BannerlordBinDir)\TaleWorlds.Starter.DotNetCore.dll">
+                    <HintPath>%(Identity)</HintPath>
+                    <Private>False</Private>
+                </Reference>
+            </ItemGroup>
+        </When>
+        <Otherwise>
+            <PropertyGroup>
+                <ReferenceAssemblyGeneratorDir Condition="'$(ReferenceAssemblyGeneratorDir)'==''">..\..\tools\ReferenceAssemblyGenerator</ReferenceAssemblyGeneratorDir>
+                <MnB2BannerlordRefAsmsDir Condition="'$(MnB2BannerlordRefAsmsDir)'==''">$(ReferenceAssemblyGeneratorDir)\ref-$(MnB2BannerlordRefAsmsVersion)</MnB2BannerlordRefAsmsDir>
+            </PropertyGroup>
+            <ItemGroup>
+                <Reference Include="$(MnB2BannerlordRefAsmsDir)\TaleWorlds.*.dll" Exclude="$(MnB2BannerlordRefAsmsDir)\TaleWorlds.Starter.DotNetCore.dll">
+                    <HintPath>%(Identity)</HintPath>
+                    <Private>False</Private>
+                </Reference>
+            </ItemGroup>
+            <ItemGroup>
+                <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+            </ItemGroup>
+        </Otherwise>
+    </Choose>
+    
     <ItemGroup>
-        <Reference Include="$(MnB2BannerlordBinDir)\TaleWorlds.*.dll" Exclude="$(MnB2BannerlordBinDir)\TaleWorlds.Starter.DotNetCore.dll">
-            <HintPath>%(Identity)</HintPath>
-            <Private>False</Private>
-        </Reference>
         <Reference Include="$(PkgLib_Harmony)\lib\net472\0Harmony.dll">
             <HintPath>%(Identity)</HintPath>
             <Private>True</Private>
@@ -46,7 +68,7 @@
     <ItemGroup>
         <PackageReference Include="HardwareProviders.CPU.Standard" Version="2.0.1" />
         <PackageReference Include="HardwareProviders.Standard" Version="2.0.1" />
-        <PackageReference Include="Lib.Harmony" Version="2.0.0.9" PrivateAssets="All">
+        <PackageReference Include="Lib.Harmony" Version="2.0.1" PrivateAssets="All">
             <GeneratePathProperty>True</GeneratePathProperty>
             <NoWarn>NU1701</NoWarn>
         </PackageReference>
@@ -81,4 +103,13 @@
             <SourceRevisionId Condition="'$(SourceRevisionId)' != ''">$(SourceRevisionId.Substring(0,7))</SourceRevisionId>
         </PropertyGroup>
     </Target>
+
+    <Target Name="PostBuildCleanup" AfterTargets="Build">
+        <Message Importance="high" Text="PostBuildCleanup" />
+        <ItemGroup>
+            <FilesToRemove Include="$(OutputPath)\InlineIL.dll" />
+            <FilesToRemove Include="$(OutputPath)\JetBrains.Annotations.dll" />
+        </ItemGroup>
+        <Delete Files="@(FilesToRemove)" ContinueOnError="false" />
+    </Target>
 </Project>
\ No newline at end of file