Now handling cardinality in the models