Added support for unit_of_measurement