Update to new URIFactory api.