Added better leader mapping for gundo