Support new supervisor mode