Models refactoring.
Measurements aggregation fixing.