Adding in changes to support changing base uri