Various changes to support measurement fields.