Added improved setter for comments