Refactor catalog manager initialization