Added ability to add comments