Update base URL
More refactoring