Refactor Managers