Renamed all references of Url to Uri