Added support for URIs