Updated comment recognition