Added mappings for buffers