Broker signalling made more generic