Adding map switching and selection to challenges