adding support for full path uri