diff --git a/Config/DefaultMounteaInteractionSystem.ini b/Config/DefaultMounteaInteractionSystem.ini
index 32da4d7..8af41c6 100644
--- a/Config/DefaultMounteaInteractionSystem.ini
+++ b/Config/DefaultMounteaInteractionSystem.ini
@@ -1,2 +1,14 @@
 [CoreRedirects]
-+ClassRedirects=(OldName="/Script/MounteaInteractionSystem.ActorInteractionFunctionLibrary",NewName="/Script/MounteaInteractionSystem.MounteaInteractionFunctionLibrary")
\ No newline at end of file
++ClassRedirects=(OldName="/Script/MounteaInteractionSystem.ActorInteractionFunctionLibrary",NewName="/Script/MounteaInteractionSystem.MounteaInteractionFunctionLibrary")
++ClassRedirects=(MatchWildcard=true,OldName="/Script/ActorInteractionPlugin.Actor...",NewName="/Script/MounteaInteractionSystem.Mountea")
+
++ClassRedirects=(MatchWildcard=true,OldName="/Script/ActorInteractionPlugin...",NewName="/Script/MounteaInteractionSystem")
++EnumRedirects=(MatchWildcard=true,OldName="/Script/ActorInteractionPlugin...",NewName="/Script/MounteaInteractionSystem")
++FunctionRedirects=(MatchWildcard=true,OldName="/Script/ActorInteractionPlugin...",NewName="/Script/MounteaInteractionSystem")
++StructRedirects=(MatchWildcard=true,OldName="/Script/ActorInteractionPlugin...",NewName="/Script/MounteaInteractionSystem")
+
++ClassRedirects=(MatchWildcard=true,OldName="/ActorInteractionPlugin...",NewName="/MounteaInteractionSystem")
++EnumRedirects=(MatchWildcard=true,OldName="/ActorInteractionPlugin...",NewName="/MounteaInteractionSystem")
++FunctionRedirects=(MatchWildcard=true,OldName="/ActorInteractionPlugin...",NewName="/MounteaInteractionSystem")
++StructRedirects=(MatchWildcard=true,OldName="/ActorInteractionPlugin...",NewName="/MounteaInteractionSystem")
++PackageRedirects=(MatchWildcard=true,OldName="/ActorInteractionPlugin...",NewName="/MounteaInteractionSystem")
\ No newline at end of file
diff --git a/Source/MounteaInteractionSystem/MounteaInteractionSystem.Build.cs b/Source/MounteaInteractionSystem/MounteaInteractionSystem.Build.cs
index 3c9221d..3e54e5a 100644
--- a/Source/MounteaInteractionSystem/MounteaInteractionSystem.Build.cs
+++ b/Source/MounteaInteractionSystem/MounteaInteractionSystem.Build.cs
@@ -38,13 +38,22 @@ public MounteaInteractionSystem(ReadOnlyTargetRules Target) : base(Target)
 				"EnhancedInput",
 				"ApplicationCore",
 				"CommonInput",
-
-				"MounteaInteractionSystemEditorNotifications", "StructUtilsEditor",
-
 #if UE_4_26_OR_LATER
 				"DeveloperSettings",
 #endif
 			}
 		);
+
+		if (Target.bBuildEditor)
+		{
+			PrivateDependencyModuleNames.AddRange
+			(
+				new string[]
+				{
+					"MounteaInteractionSystemEditorNotifications",
+					"StructUtilsEditor",
+				}
+			);
+		}
 	}
 }
\ No newline at end of file
diff --git a/Source/MounteaInteractionSystem/Private/Helpers/MounteaInteractionSystemSettings.cpp b/Source/MounteaInteractionSystem/Private/Helpers/MounteaInteractionSystemSettings.cpp
index afc407f..a2a6ca7 100644
--- a/Source/MounteaInteractionSystem/Private/Helpers/MounteaInteractionSystemSettings.cpp
+++ b/Source/MounteaInteractionSystem/Private/Helpers/MounteaInteractionSystemSettings.cpp
@@ -3,7 +3,9 @@
 #include "Helpers/MounteaInteractionSystemSettings.h"
 
 #include "InputMappingContext.h"
+#if WITH_EDITOR
 #include "StructUtilsMetadata.h"
+#endif
 #include "Helpers/MounteaInteractionSettingsConfig.h"
 #include "Materials/MaterialInterface.h"