URI utilities
Modify configuration and matchers to use URI utilities where appropriate