Re-factoring of routes