- Improved event handlers.