Adding buffermap