Change entitlement API to use bundleId instaed of baseEntitlementId