Update to allow grant overload

To extend the defined Grants.