Removed BS mapping
Added mappings for buffer resizing