Update to dynamic base_url