Added some cardinality restrictions.