Changed SortedSets to Lists.