Added some Entity stuff