Moved vars vector from solver to solver_types