Added comment functionnality