Add selectors to cpp broker features