Tackling the broker SPOF