diff --git a/TrinityCore/MapMethods.h b/TrinityCore/MapMethods.h
index 4b7c5d36c8..af1e967f2f 100644
--- a/TrinityCore/MapMethods.h
+++ b/TrinityCore/MapMethods.h
@@ -8,6 +8,7 @@
 #define MAPMETHODS_H
 
 #include "ElunaInstanceAI.h"
+#include "LuaValue.h"
 
 /***
  * A game map, e.g. Azeroth, Eastern Kingdoms, the Molten Core, etc.
@@ -335,6 +336,11 @@ namespace LuaMap
         lua_settop(E->L, tbl);
         return 1;
     }
+
+    int Data(Eluna* E, Map* map)
+    {
+        return LuaVal::PushLuaVal(E->L, map->lua_data);
+    }
     
     ElunaRegister<Map> MapMethods[] =
     {
@@ -363,6 +369,7 @@ namespace LuaMap
 
         // Other
         { "SaveInstanceData", &LuaMap::SaveInstanceData },
+        { "Data", &LuaMap::Data },
 
         { NULL, NULL }
     };
diff --git a/TrinityCore/PlayerMethods.h b/TrinityCore/PlayerMethods.h
index 96d060e0e0..8f92d1bbfd 100644
--- a/TrinityCore/PlayerMethods.h
+++ b/TrinityCore/PlayerMethods.h
@@ -3813,11 +3813,6 @@ namespace LuaPlayer
         player->RemovePet(player->GetPet(), (PetSaveMode)mode, returnreagent);
         return 0;
     }
-
-    int Data(Eluna* E, Player* player)
-    {
-        return LuaVal::PushLuaVal(E->L, player->lua_data);
-    }
     
     ElunaRegister<Player> PlayerMethods[] =
     {
@@ -4099,8 +4094,6 @@ namespace LuaPlayer
         { "SendCinematicStart", &LuaPlayer::SendCinematicStart },
         { "SendMovieStart", &LuaPlayer::SendMovieStart },
 
-        { "Data", &LuaPlayer::Data },
-
         // Not implemented methods
         { "GetHonorStoredKills", nullptr }, // classic only
         { "GetRankPoints", nullptr }, // classic only
diff --git a/TrinityCore/WorldObjectMethods.h b/TrinityCore/WorldObjectMethods.h
index 502fffd792..4a754df687 100644
--- a/TrinityCore/WorldObjectMethods.h
+++ b/TrinityCore/WorldObjectMethods.h
@@ -7,6 +7,8 @@
 #ifndef WORLDOBJECTMETHODS_H
 #define WORLDOBJECTMETHODS_H
 
+#include "LuaValue.h"
+
 /***
  * Inherits all methods from: [Object]
  */
@@ -1121,6 +1123,11 @@ namespace LuaWorldObject
 
         return 0;
     }
+
+    int Data(Eluna* E, WorldObject* obj)
+    {
+        return LuaVal::PushLuaVal(E->L, obj->lua_data);
+    }
     
     ElunaRegister<WorldObject> WorldObjectMethods[] =
     {
@@ -1176,6 +1183,7 @@ namespace LuaWorldObject
         { "PlayMusic", &LuaWorldObject::PlayMusic },
         { "PlayDirectSound", &LuaWorldObject::PlayDirectSound },
         { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound },
+        { "Data", &LuaWorldObject::Data },
 
         { NULL, NULL }
     };