Update to match new CC interface