Improve event routing