Updates for IntelliJ