Added fields for dynamic unit conversion