Improved buffers usage