Added support for 2 additional events.