Add new models.
Prepare to deal with metadata entries that have more than one value.