Removing event-stream dependency
Adding buffer support