More BOM Updates