Restructured the main stream extractor logic to use Regular Expressions to maximize detections