modified base uri usage in Client module