SolverClass added