Various changes to measurement module.