Better bolo support.