cm-refactor-dataset