Updating the way we evaluate uniqueness for data criteria. The definition field is now also considered.