Updated event structure