tosulliv: further refactoring to accomodate ccm implementation