Updated event model