Improve the solveIn method
Add the use of AlgorithmBuilder for non-solved states