CBO Refactoring phase 2