Improvements over Engine and Analyzer