Added routing to the solution