Improve for intellij 14