Updated the Comment Model