tosulliv: refactoring for CCM introduction