Added Analyzer and made changes