Update to use Uri