Added routing solution