Add more comments to BrokerProxy