Add some more text to broker and make it update tooltip
Move callback code to its own class