Refactoring AnalysisCriteria3