Changes to event model