Refactor core managers