Adding mapping for deleting current buffer