Refactors manager to use its own enum