Added support for new events.