Add mode changing support