Amounts are now split into quantity and measurement