Refactoring, added simple (string) base uri extension