Added just eventstream factory