Change base url and remove adding endpoints