Change from HashSet to List