Update to allow grant overload