[2.2] Cardinality refactor