Update following grant table API change