Modifications for CCL support
Formatting