Suggestion for eventstream api