Added buffer switching mappings