Improvement to event handling structure.