Enhanced Analyzer
Added basic functionality