Removed column for unit and made it a suffix of Quantity