Refactor route manager 3