minor changes in entitlementserviceclient class