added support for new event handlers