Added comments functionality also