Enhancement and integration for CINDI system