Update to remove base_url