Added possibility to add comments