Further rewrites: brokers module