Add base_url support