Updated comments and added route name support