Broker model refactor