Use MeasurementSet model to match connectors and new API model