Adding commenting functionality