Changes based on Intellij Analyze feature