Changes for the BOM and BOMs