Refactor manager creation.