Changes to Entity and Hero