Update CCC files and helper scripts