updated with API product changes for R20