Minor API chnages for entitlement after code review