BO refactoring - part 2