NXP-11446 Improve Variable Extractor