Continuing refactoring for CM, making relevant changes here