Ported to dispatcher jar