Added some entity functionality