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