Added routing to client