Change grant syntax

@macintux Ready for review