Modified as to support solvers