Switched from list to set for members