Added support for cardinality constraints