ServiceBroker improvements
Fixed #11 (clearing contacts on broker change)