Hopefully adds support for separate endpoint base_path