Expanded multivalue properties into their own classes.