Refactor
Decouple Map class and bom data