Added comment functionality