Switch from DataResource API -> UriResolver API