Changed ArchiveModel to display measurement & units as a single entity