Added support for URI, Uri and URL