Added fields for comments