Added new framework for Buffers