UriResolver and UriRetriever added