Better handling of event updates