more cms refactoring post moving it into marketplace solution