Upgraded event-stream