Replace list with set, better searching