Added some Entity methods