Add more generics for CC