Refactoring get rid of SolverMediator