Refactored "add state" for entities and players