#24 broker interface moved to common