Added product id for Apex RAW