FSP support for CC, Factorization support for CC and OC