Added some entity and collection stuff. :)