CCTI Toolkit: NVCC Improvement Plan