Change so that we can pass through and use URIs in additional to the ori...

...ginal functionality.