Changes inside ccfactory