Update to work with URI