Add support for multiple upstreams