Added EntityHandler, entity self-creation