Added comment structure