Refactored PropertyAnalyzer