Improving RouteHelper again