Adding support for CCL