BL Refactoring