Fix Comment Generation and add Id Field