Updated BOM to current