Readded CC support