Got rid of Broker class