Cleaned up SolutionSet interface