Update cc helper and blocks