Added support for Uri object