Added some mappings for buffers