Adding support for additional url matching