Code Analyzer changes