Added Solve class