Completion of Model and ViewModel support for all except measurements.