Updated event architecture