Improve event propagation