Align with the changes to use the new BOM's