Added Comment Scanning