Some progress on EventStreamSpec