Intellij IDEA related modifications