Added new event handlers.