Added the comment class