Improve Parser, Add Analyzer