Added some entity support. Fixed Keys