Improved CCI generation