Adding proper conversion of measurement values