Match new spec for uniqueness validation