Refactored events to use a single stream of events per event type.