Added streamId field to EventStream