Added support for JHat events