Add ability to use buffers