added new switch statements in SolverFactory