In cac:TenderingCriterionProperty, instead of having the elements cbc:ExpectedID and cbc:ExpectedCode we'd need cac:ExpectedID (cardinality 0..n) and cac:ExpectedCode (0..n).

Rationale:

1) need to specify multiple IDs for the EO. Examples: (a) VAT number AND Pre-Qualification System ID for the EO; (b) Expected LOTS IDs, other...
2) need to specify multiple CPV codes to describe the products, services or works that a CA expects an EO is capable to deliver, perform or execute