Refactor manager creation