Got fixed everything for IntelliJ support