Support shift remapping