Add multi mode support