Switched from Vectors to  LinkedHashSets