Added fields for previously submitted values