Separate the broker concern