Updates to work with IntelliJ IDEA