Improved the event stream choice