Added minor buffer mappings