Added CPU Solver to factory