Add more aggressive deduplication of entities