Optimize events with single handler