Adds streaming support as well as buffers.