Refactor reoute manager 2