diff --git a/LuaFunctions.cpp b/LuaFunctions.cpp
index 051a5e0..c050eb4 100644
--- a/LuaFunctions.cpp
+++ b/LuaFunctions.cpp
@@ -251,6 +251,8 @@ ElunaRegister<Unit> UnitMethods[] =
     { "GetGender", &LuaUnit::GetGender },
     { "GetRace", &LuaUnit::GetRace },
     { "GetClass", &LuaUnit::GetClass },
+    { "GetRaceMask", &LuaUnit::GetRaceMask },
+    { "GetClassMask", &LuaUnit::GetClassMask },
     { "GetRaceAsString", &LuaUnit::GetRaceAsString },
     { "GetClassAsString", &LuaUnit::GetClassAsString },
     { "GetAura", &LuaUnit::GetAura },
diff --git a/UnitMethods.h b/UnitMethods.h
index f4d8d57..fdcbbe5 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -1058,6 +1058,28 @@ namespace LuaUnit
         return 1;
     }
 
+    /**
+    * Returns the race mask
+    *
+    * @return uint32 racemask
+    */
+    int GetRaceMask(lua_State* L, Unit* unit)
+    {
+        Eluna::Push(L, unit->getRaceMask());
+        return 1;
+    }
+
+    /**
+    * Returns the class mask
+    *
+    * @return uint32 classmask
+    */
+    int GetClassMask(lua_State* L, Unit* unit)
+    {
+        Eluna::Push(L, unit->getClassMask());
+        return 1;
+    }
+
     /**
      * Returns the [Unit]'s creature type ID like wolf or humanoid.
      *