Adding buffermap back