Refactor managers