created interface for UriFactory and replaced usages