replaced constants base uri with base uri handler