Refactored Analyzer with a new type