Switch to linked hash set