Better IntelliJ IDEA support