Improve deduping