Enhancement of the CINDI system