Updated comments functionality