Intermediary stage for new subscription/entitlement apis change