- Tidy up MeasurementFactory
- Add MeasurementOptions to provide a set of global default options