Changed BaseUrl to Uri instead of string