Started the change of TreeMaps stored in the db to TreeSets.