Add configurable buffer support