Removed stream-buffer dependency