Updated generic-solver.h