Add working Cardinality wrapper