Add a bit more infrastructure for storing results from the solver