Added key-mappings to work with buffers