Use uniq values instead of generation