Updated Route generator