CDCM multi-model refactoring.