Updates to use new measurements interfaces.