diff --git a/TODOs b/TODOs
new file mode 100644
index 000000000..c003a6385
--- /dev/null
+++ b/TODOs
@@ -0,0 +1,6 @@
+- Rewrite haxeLib updater to conform with read/write thread mechanics & activities
+- Fix issue with annotation/ metadata breaking refactoring (pull members up)
+- rewrite compiler/run/debug logic , do it the way jetbrains recommends.
+- rework CodeStyleSettings (get rid of INSERT_OVERRIDE_ANNOTATION)
+
+- add support for Abstract classes (rename current abstract "class" type to avoid confusion)
\ No newline at end of file
diff --git a/common/src/main/java/com/intellij/plugins/haxe/HaxeCommonBundle.java b/common/src/main/java/com/intellij/plugins/haxe/HaxeCommonBundle.java
index 377c7a2d5..62e9fbd45 100644
--- a/common/src/main/java/com/intellij/plugins/haxe/HaxeCommonBundle.java
+++ b/common/src/main/java/com/intellij/plugins/haxe/HaxeCommonBundle.java
@@ -19,12 +19,11 @@
 package com.intellij.plugins.haxe;
 
 import com.intellij.AbstractBundle;
-import com.intellij.CommonBundle;
-import com.intellij.reference.SoftReference;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
 
 import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
 import java.util.ResourceBundle;
 
 /**
@@ -47,7 +46,7 @@ private static ResourceBundle getBundle() {
 
     if (bundle == null) {
       bundle = ResourceBundle.getBundle(BUNDLE);
-      ourBundle = new SoftReference<ResourceBundle>(bundle);
+      ourBundle = new SoftReference<>(bundle);
     }
     return bundle;
   }
diff --git a/gradle.properties b/gradle.properties
index 35cd7eda9..2a21e8006 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ pluginName = Haxe Toolkit Support
 pluginRepositoryUrl = https://github.com/HaxeFoundation/intellij-haxe
 
 # SemVer format -> https://semver.org
-pluginVersion = 1.4.0
+pluginVersion = 1.4.0 (Beta 10)
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IU
diff --git a/src/main/java/com/intellij/plugins/haxe/HaxeBundle.java b/src/main/java/com/intellij/plugins/haxe/HaxeBundle.java
index fe80b2fc6..10484af3a 100644
--- a/src/main/java/com/intellij/plugins/haxe/HaxeBundle.java
+++ b/src/main/java/com/intellij/plugins/haxe/HaxeBundle.java
@@ -18,14 +18,12 @@
 package com.intellij.plugins.haxe;
 
 import com.intellij.AbstractBundle;
-import com.intellij.CommonBundle;
 import com.intellij.DynamicBundle;
-import com.intellij.reference.SoftReference;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
 import java.util.ResourceBundle;
 
 public class HaxeBundle extends DynamicBundle {
@@ -49,7 +47,7 @@ private static ResourceBundle getBundle() {
 
     if (bundle == null) {
       bundle = ResourceBundle.getBundle(BUNDLE);
-      ourBundle = new SoftReference<ResourceBundle>(bundle);
+      ourBundle = new SoftReference<>(bundle);
     }
     return bundle;
   }
diff --git a/src/main/java/com/intellij/plugins/haxe/HaxeProjectBundle.java b/src/main/java/com/intellij/plugins/haxe/HaxeProjectBundle.java
index 5eeb8a4b7..0a353adc7 100644
--- a/src/main/java/com/intellij/plugins/haxe/HaxeProjectBundle.java
+++ b/src/main/java/com/intellij/plugins/haxe/HaxeProjectBundle.java
@@ -19,11 +19,11 @@
 
 import com.intellij.AbstractBundle;
 import com.intellij.DynamicBundle;
-import com.intellij.reference.SoftReference;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
 
 import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
 import java.util.ResourceBundle;
 
 public class HaxeProjectBundle extends DynamicBundle {
@@ -48,7 +48,7 @@ private static ResourceBundle getBundle() {
 
     if (bundle == null) {
       bundle = ResourceBundle.getBundle(BUNDLE);
-      ourBundle = new SoftReference<ResourceBundle>(bundle);
+      ourBundle = new SoftReference<>(bundle);
     }
     return bundle;
   }
diff --git a/src/main/java/com/intellij/plugins/haxe/HaxeRefactoringBundle.java b/src/main/java/com/intellij/plugins/haxe/HaxeRefactoringBundle.java
index 887726866..2beb4fe38 100644
--- a/src/main/java/com/intellij/plugins/haxe/HaxeRefactoringBundle.java
+++ b/src/main/java/com/intellij/plugins/haxe/HaxeRefactoringBundle.java
@@ -20,11 +20,11 @@
 import com.intellij.AbstractBundle;
 import com.intellij.CommonBundle;
 import com.intellij.DynamicBundle;
-import com.intellij.reference.SoftReference;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.PropertyKey;
 
 import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
 import java.util.ResourceBundle;
 
 public class HaxeRefactoringBundle extends DynamicBundle {
@@ -49,7 +49,7 @@ private static ResourceBundle getBundle() {
 
     if (bundle == null) {
       bundle = ResourceBundle.getBundle(BUNDLE);
-      ourBundle = new SoftReference<ResourceBundle>(bundle);
+      ourBundle = new SoftReference<>(bundle);
     }
     return bundle;
   }