added a new option for the whole base_uri vs. just a host/port