New version including detailed BOM