New leader mapping, plus dispatch for java