Added validation for comments