updated Measurements and MeasurementTypes to use uuids