Added uniq and keyf