Cardinality analysis updated