Added better leader mapping