Add base_uri support