Changes to BasicBufferMgr to implement Map