Feature/add ccs support