refactor(EventStream): use a single EventStream