Updated event class