Improved handling of multiple buffers