Continue work on CC data types