Added TreeMap to SolutionGenerator