Updated router pattern matching.