Change field order for entitlement apis