Add supports for custom baseURL