Add support for newer events for jobs