Update for event handling