diff --git a/src/main/java/lc/captchas/FontFunCaptcha.java b/src/main/java/lc/captchas/FontFunCaptcha.java
index bb1c278..3ad134c 100644
--- a/src/main/java/lc/captchas/FontFunCaptcha.java
+++ b/src/main/java/lc/captchas/FontFunCaptcha.java
@@ -6,7 +6,7 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 import lc.captchas.interfaces.Challenge;
 import lc.captchas.interfaces.ChallengeProvider;
@@ -18,13 +18,12 @@ public class FontFunCaptcha implements ChallengeProvider {
     return "FontFunCaptcha";
   }
 
-  public HashMap<String, List<String>> supportedParameters() {
-    HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>();
-    supportedParams.put("supportedLevels", List.of("medium"));
-    supportedParams.put("supportedMedia", List.of("image/png"));
-    supportedParams.put("supportedInputType", List.of("text"));
-
-    return supportedParams;
+  public Map<String, List<String>> supportedParameters() {
+    return Map.of(
+      "supportedLevels", List.of("medium"),
+      "supportedMedia", List.of("image/png"),
+      "supportedInputType", List.of("text")
+    );
   }
 
   public void configure(String config) {
diff --git a/src/main/java/lc/captchas/GifCaptcha.java b/src/main/java/lc/captchas/GifCaptcha.java
index 13cf0fa..19b161a 100644
--- a/src/main/java/lc/captchas/GifCaptcha.java
+++ b/src/main/java/lc/captchas/GifCaptcha.java
@@ -6,7 +6,7 @@ import java.awt.RenderingHints;
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 
 import javax.imageio.stream.ImageOutputStream;
@@ -55,13 +55,12 @@ public class GifCaptcha implements ChallengeProvider {
     // TODO: Add custom config
   }
 
-  public HashMap<String, List<String>> supportedParameters() {
-    HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>();
-    supportedParams.put("supportedLevels", List.of("hard"));
-    supportedParams.put("supportedMedia", List.of("image/gif"));
-    supportedParams.put("supportedInputType", List.of("text"));
-
-    return supportedParams;
+  public Map<String, List<String>> supportedParameters() {
+    return Map.of(
+      "supportedLevels", List.of("hard"),
+      "supportedMedia", List.of("image/gif"),
+      "supportedInputType", List.of("text")
+    );
   }
 
   public Challenge returnChallenge() {
diff --git a/src/main/java/lc/captchas/ShadowTextCaptcha.java b/src/main/java/lc/captchas/ShadowTextCaptcha.java
index 5b3b873..ba26513 100644
--- a/src/main/java/lc/captchas/ShadowTextCaptcha.java
+++ b/src/main/java/lc/captchas/ShadowTextCaptcha.java
@@ -10,7 +10,7 @@ import java.awt.image.BufferedImage;
 import java.awt.image.ConvolveOp;
 import java.awt.image.Kernel;
 import java.io.ByteArrayOutputStream;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 
 import lc.misc.HelperFunctions;
@@ -27,13 +27,12 @@ public class ShadowTextCaptcha implements ChallengeProvider {
     // TODO: Add custom config
   }
 
-  public HashMap<String, List<String>> supportedParameters() {
-    HashMap<String, List<String>> supportedParams = new HashMap<String, List<String>>();
-    supportedParams.put("supportedLevels", List.of("easy"));
-    supportedParams.put("supportedMedia", List.of("image/png"));
-    supportedParams.put("supportedInputType", List.of("text"));
-
-    return supportedParams;
+  public Map<String, List<String>> supportedParameters() {
+    return Map.of(
+      "supportedLevels", List.of("easy"),
+      "supportedMedia", List.of("image/png"),
+      "supportedInputType", List.of("text")
+    );
   }
 
   public boolean checkAnswer(String secret, String answer) {
diff --git a/src/main/scala/lc/captchas/FilterChallenge.scala b/src/main/scala/lc/captchas/FilterChallenge.scala
index 4fcc89d..8c21e78 100644
--- a/src/main/scala/lc/captchas/FilterChallenge.scala
+++ b/src/main/scala/lc/captchas/FilterChallenge.scala
@@ -7,7 +7,6 @@ import java.awt.Font
 import java.awt.Color
 import lc.captchas.interfaces.ChallengeProvider
 import lc.captchas.interfaces.Challenge
-import scala.jdk.CollectionConverters.MapHasAsJava
 import java.util.{List => JavaList, Map => JavaMap}
 
 class FilterChallenge extends ChallengeProvider {
@@ -18,13 +17,11 @@ class FilterChallenge extends ChallengeProvider {
   }
 
   def supportedParameters(): JavaMap[String, JavaList[String]] = {
-    val supportedParams = Map(
-      "supportedLevels" -> JavaList.of("medium", "hard"),
-      "supportedMedia" -> JavaList.of("image/png"),
-      "supportedInputType" -> JavaList.of("text")
-    ).asJava
-
-    supportedParams
+    JavaMap.of(
+      "supportedLevels",JavaList.of("medium", "hard"),
+      "supportedMedia", JavaList.of("image/png"),
+      "supportedInputType", JavaList.of("text")
+    )
   }
 
   def returnChallenge(): Challenge = {
diff --git a/src/main/scala/lc/captchas/LabelCaptcha.scala b/src/main/scala/lc/captchas/LabelCaptcha.scala
index 5233678..cd008e7 100644
--- a/src/main/scala/lc/captchas/LabelCaptcha.scala
+++ b/src/main/scala/lc/captchas/LabelCaptcha.scala
@@ -9,7 +9,6 @@ import java.awt.image.BufferedImage
 import java.awt.Color
 import lc.captchas.interfaces.ChallengeProvider
 import lc.captchas.interfaces.Challenge
-import scala.jdk.CollectionConverters.MapHasAsJava
 import java.util.{List => JavaList, Map => JavaMap}
 
 class LabelCaptcha extends ChallengeProvider {
@@ -30,13 +29,11 @@ class LabelCaptcha extends ChallengeProvider {
   }
 
   def supportedParameters(): JavaMap[String, JavaList[String]] = {
-    val supportedParams = Map(
-      "supportedLevels" -> JavaList.of("hard"),
-      "supportedMedia" -> JavaList.of("image/png"),
-      "supportedInputType" -> JavaList.of("text")
-    ).asJava
-
-    supportedParams
+    JavaMap.of(
+      "supportedLevels", JavaList.of("hard"),
+      "supportedMedia", JavaList.of("image/png"),
+      "supportedInputType", JavaList.of("text")
+    )
   }
 
   def returnChallenge(): Challenge =
diff --git a/src/main/scala/lc/captchas/RainDropsCaptcha.scala b/src/main/scala/lc/captchas/RainDropsCaptcha.scala
index 0b08dcd..88581fd 100644
--- a/src/main/scala/lc/captchas/RainDropsCaptcha.scala
+++ b/src/main/scala/lc/captchas/RainDropsCaptcha.scala
@@ -10,7 +10,6 @@ import javax.imageio.stream.MemoryCacheImageOutputStream;
 import lc.captchas.interfaces.ChallengeProvider
 import lc.captchas.interfaces.Challenge
 import lc.misc.GifSequenceWriter
-import scala.jdk.CollectionConverters.MapHasAsJava
 import java.util.{List => JavaList, Map => JavaMap}
 
 class Drop {
@@ -38,13 +37,11 @@ class RainDropsCP extends ChallengeProvider {
   }
 
   def supportedParameters(): JavaMap[String, JavaList[String]] = {
-    val supportedParams = Map(
-      "supportedLevels" -> JavaList.of("medium", "easy"),
-      "supportedMedia" -> JavaList.of("image/gif"),
-      "supportedInputType" -> JavaList.of("text")
-    ).asJava
-
-    supportedParams
+    JavaMap.of(
+      "supportedLevels", JavaList.of("medium", "easy"),
+      "supportedMedia", JavaList.of("image/gif"),
+      "supportedInputType", JavaList.of("text")
+    )
   }
 
   private def extendDrops(drops: Array[Drop], steps: Int, xOffset: Int) = {