Changed Lists to HashMaps or HashSets