modified ConfigurationSolver