Updated signatures and implementations of UriExtensions methods