Changing all HashSet implementations to LinkedHashSet