Remove EventStream and use []Event instead