Added support for URI