Updated the fields to match the column names