Simplified the broker a bit