Modifying event handler usage