add support for latest Grizzly changes