Reimplemented message routing