diff --git a/DataStore/API/Core.lua b/DataStore/API/Core.lua
index 82ae1bd..5259457 100644
--- a/DataStore/API/Core.lua
+++ b/DataStore/API/Core.lua
@@ -15,6 +15,7 @@ local modulesList = {
 	["DataStore_Characters"] = true,
 	["DataStore_Containers"] = true,
 	["DataStore_Crafts"] = true,
+	["DataStore_Currencies"] = true,
 	["DataStore_Inventory"] = true,
 	["DataStore_Mails"] = true,
 	["DataStore_Quests"] = true,
@@ -23,15 +24,8 @@ local modulesList = {
 	["DataStore_Talents"] = true
 }
 
-if WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC then
-	-- Add cataclysm modules
-	modulesList["DataStore_Currencies"] = true
-elseif LE_EXPANSION_LEVEL_CURRENT == LE_EXPANSION_MISTS_OF_PANDARIA then
-	-- Add mists of pandaria modules
-	modulesList["DataStore_Currencies"] = true												 
-elseif WOW_PROJECT_ID == WOW_PROJECT_MAINLINE then
+if WOW_PROJECT_ID == WOW_PROJECT_MAINLINE then
 	-- retail, add the remaining modules
-	modulesList["DataStore_Currencies"] = true
 	modulesList["DataStore_Garrisons"] = true
 	modulesList["DataStore_Pets"] = true
 	modulesList["DataStore_Stats"] = true
@@ -186,7 +180,7 @@ function addon:RegisterModule(options)
 		local prefix = format("%sDataStore%s: ", teal, white)
 
 		print(format("%sError triggered by : %s%s", prefix, yellow, moduleName))
-		print("You are using an unauthorized DataStore module that breaches the licensing rights of DataStore's sole author (Thaoky, EU-Marécages de Zangar).")
+		print("You are using an unauthorized DataStore module that breaches the licensing rights of DataStore's sole author (Thaoky, EU-Marécages de Zangar).")
 		print("The development and distribution of unauthorized DataStore modules outside of the official Altoholic package is prohibited by the 'All Rights Reserved' licensing terms.")
 		print("|cFFFFFF00What you should do :")
 		print(format("Leave the game and clear all Altoholic* and DataStore* folders from the %sInterface\\Addons%s folder, and make a manual download of the latest version of Altoholic from one of the two official sources (Curseforge and WoW Interface).", cyan, white))
@@ -310,6 +304,7 @@ function addon:IsModuleEnabled(name)
 	if registeredModules[name] then
 		return true
 	end
+	return false
 end
 
 function addon:IterateModules(callback)
@@ -451,3 +446,5 @@ function addon:ImportCharacter(key, faction, guild)
 	end)
 end
 
+
+
diff --git a/DataStore/DataStore.toc b/DataStore/DataStore.toc
index 0ea8d0c..83636c9 100644
--- a/DataStore/DataStore.toc
+++ b/DataStore/DataStore.toc
@@ -1,10 +1,10 @@
-## Interface: 110205, 50501, 11507
+## Interface: 110207, 50503, 20505, 11508
 ## Title: DataStore by |cFF69CCF0Thaoky|r
 ## IconTexture: Interface\Icons\garrison_building_storehouse
 
 ## Notes: Main DataStore Module
 ## Author: Thaoky (EU-Marécages de Zangar)
-## Version: 2025.10.19
+## Version: 2026.01.16
 ## Dependencies: AddonFactory
 ## SavedVariables: DataStore_GuildIDs, DataStore_GuildFactions, DataStore_CharacterIDs, DataStore_CharacterGUIDs, DataStore_CharacterGuilds, DataStore_AltGroups, DataStore_ConnectedRealms, DataStore_RealmNames
 ## X-Category: Interface Enhancements