MeasureCollection class added
Fixes