CR refactoring, changes to cr console