Update event_handler