UPDATE router to use msg bus