Refactoring #21: using entity::Measurements.