Changed EventStream back into a type