Cardinality refactoring