diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index b559cb5dd90..f2194deb64f 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -12,6 +12,8 @@ GVAR(showHudHash) = createHashMap;
 GVAR(vehicleIconCache) = createHashMap; // for getVehicleIcon
 GVAR(wheelSelections) = createHashMap;
 
+GVAR(InteractionConditions) = createHashMap;
+
 GVAR(blockItemReplacement) = false;
 
 // Cache for FUNC(isModLoaded)
diff --git a/addons/common/functions/fnc_addCanInteractWithCondition.sqf b/addons/common/functions/fnc_addCanInteractWithCondition.sqf
index 3dce27cf554..1d315f5aa53 100644
--- a/addons/common/functions/fnc_addCanInteractWithCondition.sqf
+++ b/addons/common/functions/fnc_addCanInteractWithCondition.sqf
@@ -19,17 +19,4 @@
 params ["_conditionName", "_conditionFunc"];
 
 _conditionName = toLowerANSI _conditionName;
-
-private _conditions = missionNamespace getVariable [QGVAR(InteractionConditions), [[],[]]];
-_conditions params ["_conditionNames", "_conditionFuncs"];
-
-private _index = _conditionNames find _conditionName;
-
-if (_index == -1) then {
-    _index = count _conditionNames;
-};
-
-_conditionNames set [_index, _conditionName];
-_conditionFuncs set [_index, _conditionFunc];
-
-GVAR(InteractionConditions) = _conditions;
+GVAR(InteractionConditions) set [_conditionName, _conditionFunc];
diff --git a/addons/common/functions/fnc_canInteractWith.sqf b/addons/common/functions/fnc_canInteractWith.sqf
index dd684d0619b..134a3101e4b 100644
--- a/addons/common/functions/fnc_canInteractWith.sqf
+++ b/addons/common/functions/fnc_canInteractWith.sqf
@@ -27,15 +27,11 @@ private _owner = _target getVariable [QGVAR(owner), objNull];
 if (!isNull _owner && {_unit != _owner}) exitWith {false};
 
 // check general conditions
-private _conditions = missionNamespace getVariable [QGVAR(InteractionConditions), [[],[]]];
-_conditions params ["_conditionNames", "_conditionFuncs"];
-
 private _canInteract = true;
-
 {
-    if (!(_x in _exceptions) && {!([_unit, _target] call (_conditionFuncs select _forEachIndex))}) exitWith {
+    if (!(_x in _exceptions) && {!([_unit, _target] call _y)}) exitWith {
         _canInteract = false;
     };
-} forEach _conditionNames;
+} forEach GVAR(InteractionConditions);
 
 _canInteract
diff --git a/addons/common/functions/fnc_removeCanInteractWithCondition.sqf b/addons/common/functions/fnc_removeCanInteractWithCondition.sqf
index 6c5e8b56b66..841a9a00b15 100644
--- a/addons/common/functions/fnc_removeCanInteractWithCondition.sqf
+++ b/addons/common/functions/fnc_removeCanInteractWithCondition.sqf
@@ -18,16 +18,4 @@
 params ["_conditionName"];
 
 _conditionName = toLowerANSI _conditionName;
-
-private _conditions = missionNamespace getVariable [QGVAR(InteractionConditions), [[],[]]];
-
-_conditions params ["_conditionNames", "_conditionFuncs"];
-
-private _index = _conditionNames find _conditionName;
-
-if (_index == -1) exitWith {};
-
-_conditionNames deleteAt _index;
-_conditionFuncs deleteAt _index;
-
-GVAR(InteractionConditions) = _conditions;
+GVAR(InteractionConditions) deleteAt _conditionName;