MeasurementType is now an enum class