Make URIResolver an interface