Renamed number_of_unit to quantity