Improved units of measurement handling.