Added an EventSourceId structure