Added a comments functionality