Refactoring for newer Grizzly / Jersey API