message routing improvements