[IMPROVEMENT] New routing implementation