Refactor Entity/Managers