Add CCL support