refactor creation manager