Added further support for Foundation.Uri