Refactor Broker to Message