Added new fields to EPI report and csv file