cms bundle refactoring