Optimized MaskAnalyzer reqular expression
MaskAnalyzer update