Andrea Boriero Right, so this is asking that we consider the natural-id uniqueness to also be based on discriminator as well: natural-id + discriminator-value.