Rework the dependencies of CFCore 2.0