Refactor AceModeMapper