Removed reference to MeasureModel for the moment