Deduplicating with more fields