Fill in more cpp broker features