Refactored Remapping Modes.