CFY-1511 use Set instead of list