Cardinality refactor