Initial support for multiple endpoints, with basic aggregation of results