diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/AddMapWithAIPanel.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/AddMapWithAIPanel.java
index 45b136a..0e14666 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/AddMapWithAIPanel.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/AddMapWithAIPanel.java
@@ -28,7 +28,6 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.JTextComponent;
 
-import org.apache.commons.lang3.tuple.Pair;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoaderJob;
@@ -40,6 +39,7 @@ import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
 import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo.MapWithAIType;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
  * An panel used to add MapWithAI sources.
@@ -184,8 +184,8 @@ public class AddMapWithAIPanel extends JPanel {
         for (Map.Entry<String, Pair<String, Boolean>> entry : parameters.entrySet()) {
             JsonObjectBuilder entryBuilder = Json.createObjectBuilder();
             entryBuilder.add("parameter", entry.getKey());
-            entryBuilder.add("description", entry.getValue().getKey());
-            entryBuilder.add("enabled", entry.getValue().getValue());
+            entryBuilder.add("description", entry.getValue().a);
+            entryBuilder.add("enabled", entry.getValue().b);
             builder.add(entryBuilder.build());
         }
         return builder.build();
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIParametersPanel.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIParametersPanel.java
index d1674e3..959fdd7 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIParametersPanel.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIParametersPanel.java
@@ -19,8 +19,8 @@ import javax.swing.event.TableModelListener;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
 
-import org.apache.commons.lang3.tuple.Pair;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Pair;
 
 public class MapWithAIParametersPanel extends JPanel {
 
@@ -124,7 +124,7 @@ public class MapWithAIParametersPanel extends JPanel {
 
     private static List<Object[]> getHeadersAsVector(Map<String, Pair<String, Boolean>> headers) {
         return headers.entrySet().stream().sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey()))
-                .map(e -> new Object[] { e.getKey(), e.getValue().getLeft(), e.getValue().getRight() })
+                .map(e -> new Object[] { e.getKey(), e.getValue().a, e.getValue().b })
                 .collect(Collectors.toList());
     }
 
@@ -133,7 +133,7 @@ public class MapWithAIParametersPanel extends JPanel {
      */
     public Map<String, Pair<String, Boolean>> getParameters() {
         return headers.stream().distinct()
-                .collect(Collectors.toMap(x -> (String) x[0], x -> Pair.of((String) x[1], (Boolean) x[2])));
+                .collect(Collectors.toMap(x -> (String) x[0], x -> new Pair<>((String) x[1], (Boolean) x[2])));
     }
 
     public void setParameters(JsonArray parameters) {