Extended with keywords detections