Added comments functionality