Better api for Stream
Fix site