Added IntelliJ support v2