Improved Event Handling