Adding support for C3 product line