Add mode handling