Added more features to comments and attachments