Bom refactoring