Implemented the comment features