Add CIA broker support