Completed the route assembly
Modified the route matching