Added new fields in the mailTemplate component