[2.2] Cardinality refactoring