diff --git a/AdiBags_Vanilla.toc b/AdiBags_Vanilla.toc
index a754d96..0c8a0cd 100644
--- a/AdiBags_Vanilla.toc
+++ b/AdiBags_Vanilla.toc
@@ -43,8 +43,12 @@ libs\LibSharedMedia-3.0\lib.xml
 
 libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
 
-Localization.lua
 core\EventHandlers.lua
+core\Boot.lua
+
+Localization.lua
+
+core\Experiments.lua
 core\Fonts.lua
 core\Constants.lua
 core\Utility.lua
diff --git a/AdiBags_Wrath.toc b/AdiBags_Wrath.toc
index 6b93ac0..f31c3a2 100644
--- a/AdiBags_Wrath.toc
+++ b/AdiBags_Wrath.toc
@@ -43,8 +43,12 @@ libs\LibSharedMedia-3.0\lib.xml
 
 libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
 
-Localization.lua
 core\EventHandlers.lua
+core\Boot.lua
+
+Localization.lua
+
+core\Experiments.lua
 core\Fonts.lua
 core\Constants.lua
 core\Utility.lua
diff --git a/modules/DataSource.lua b/modules/DataSource.lua
index 56ad81a..63bca7b 100644
--- a/modules/DataSource.lua
+++ b/modules/DataSource.lua
@@ -85,14 +85,24 @@ function mod:OnEnable()
 end
 
 function mod:BANKFRAME_OPENED(e, kind)
-	if kind == Enum.PlayerInteractionType.Banker then
+	if addon.isRetail or addon.isWrath then
+		if kind == Enum.PlayerInteractionType.Banker then
+			self.atBank = true
+			return self:Update()
+		end
+	else
 		self.atBank = true
 		return self:Update()
 	end
 end
 
 function mod:BANKFRAME_CLOSED(e, kind)
-	if kind == Enum.PlayerInteractionType.Banker then
+	if addon.isRetail or addon.isWrath then
+		if kind == Enum.PlayerInteractionType.Banker then
+			self.atBank = false
+			return self:Update()
+		end
+	else
 		self.atBank = false
 		return self:Update()
 	end