Improved the indexing of MeasurementImpl.