Support for newer versions of grape