Added annotation detection.