Improve event handler