Added comment functionality v1