Added support for buffers
Added support for buffers