Update for latest IDEA