add support for multiple CIs with the same caid