Add MeasurementSet
Adjust csv parser to return measurement class