added buffer mappings