Added support for multiplicity.