From f2b33b007bcd654f40ec0f5e3fae6d8df7446d8f Mon Sep 17 00:00:00 2001
From: Denis Rosa <deniswsrosa@gmail.com>
Date: Wed, 19 Jun 2024 20:49:28 +0200
Subject: [PATCH] Adding Support for dynamodb migration

---
 .idea/codeStyles/Project.xml                  |   7 +-
 .idea/codeStyles/codeStyleConfig.xml          |   1 -
 build.gradle.kts                              |   2 +
 .../listener/DependenciesDownloader.java      |  49 +-
 .../intellij/listener/DependenciesUtil.java   |   5 +-
 .../intellij/tools/PillowFightDialog.java     | 143 +++-
 .../tools/cbmigrate/CBMigrateDynamo.java      | 175 +++++
 .../{CBMigrate.java => CBMigrateMongo.java}   |   4 +-
 .../tools/cbmigrate/DynamoConnection.java     |  68 ++
 .../cbmigrate/DynamoMigrationDialog.java      | 670 ++++++++++++++++++
 .../tools/cbmigrate/MigrationDialog.java      |  47 +-
 .../intellij/tree/TreeRightClickListener.java | 144 ++--
 .../tree/docfilter/DocumentFilterDialog.java  |  77 +-
 .../workbench/FavoriteQueryDialog.java        |  36 +-
 14 files changed, 1224 insertions(+), 204 deletions(-)
 create mode 100644 src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrateDynamo.java
 rename src/main/java/com/couchbase/intellij/tools/cbmigrate/{CBMigrate.java => CBMigrateMongo.java} (98%)
 create mode 100644 src/main/java/com/couchbase/intellij/tools/cbmigrate/DynamoConnection.java
 create mode 100644 src/main/java/com/couchbase/intellij/tools/cbmigrate/DynamoMigrationDialog.java

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0daa7c5a..091adcfb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,8 +6,13 @@
     <codeStyleSettings language="JAVA">
       <option name="KEEP_LINE_BREAKS" value="false" />
       <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
       <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-      <option name="WRAP_LONG_LINES" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
+      <option name="KEEP_BUILDER_METHODS_INDENTS" value="true" />
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 6e6eec11..79ee123c 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index e3075165..53de2383 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,6 +29,8 @@ dependencies {
     implementation("org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r")
     implementation("com.google.code.gson:gson:2.10.1")
 
+    implementation("software.amazon.awssdk:dynamodb:2.25.60")
+    implementation("software.amazon.awssdk:auth:2.25.60")
     implementation("org.mongodb:mongodb-driver-sync:4.11.1")
 
     implementation("com.google.code.gson:gson:2.10.1")
diff --git a/src/main/java/com/couchbase/intellij/listener/DependenciesDownloader.java b/src/main/java/com/couchbase/intellij/listener/DependenciesDownloader.java
index f9bf7e79..afc11265 100644
--- a/src/main/java/com/couchbase/intellij/listener/DependenciesDownloader.java
+++ b/src/main/java/com/couchbase/intellij/listener/DependenciesDownloader.java
@@ -48,10 +48,7 @@ private Map<CBTools.Type, String> getToolsMap(String toolKey, String os) {
         String suffix = "";
         String path = "bin" + File.separator;
 
-        boolean unixBased = MACOS_64.equals(os)
-                || MACOS_ARM.equals(os)
-                || LINUX_64.equals(os)
-                || LINUX_ARM.equals(os);
+        boolean unixBased = MACOS_64.equals(os) || MACOS_ARM.equals(os) || LINUX_64.equals(os) || LINUX_ARM.equals(os);
 
         if (!unixBased) {
             suffix = ".exe";
@@ -90,37 +87,37 @@ public Map<String, ToolSpec> getDownloadList(String os) {
             map.put(TOOL_SHELL, getToolSpec("https://github.com/couchbaselabs/couchbase-shell/releases/download/v0.75.1/cbsh-x86_64-apple-darwin.zip", TOOL_SHELL, MACOS_64));
             map.put(TOOL_IMPORT_EXPORT, getToolSpec("https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-macos_x86_64.zip", TOOL_IMPORT_EXPORT, MACOS_64));
             map.put(ALL_TOOLS, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/7.2.0-macos_64.zip", ALL_TOOLS, MACOS_64));
-            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_darwin_amd64.zip", CB_MIGRATE, MACOS_64));
+            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_darwin_amd64.zip", CB_MIGRATE, MACOS_64));
 
         } else if (MACOS_ARM.equals(os)) {
             map.put(TOOL_SHELL, getToolSpec("https://github.com/couchbaselabs/couchbase-shell/releases/download/v0.75.1/cbsh-aarch64-apple-darwin.zip", TOOL_SHELL, MACOS_ARM));
             map.put(TOOL_IMPORT_EXPORT, getToolSpec("https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-macos_arm64.zip", TOOL_IMPORT_EXPORT, MACOS_ARM));
             map.put(ALL_TOOLS, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/7.2.0-macos_arm.zip", ALL_TOOLS, MACOS_ARM));
-            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_darwin_arm64.zip", CB_MIGRATE, MACOS_ARM));
+            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_darwin_arm64.zip", CB_MIGRATE, MACOS_ARM));
 
 
         } else if (WINDOWS_64.equals(os)) {
             map.put(TOOL_SHELL, getToolSpec("https://github.com/couchbaselabs/couchbase-shell/releases/download/v0.75.1/cbsh-x86_64-pc-windows-msvc.zip", TOOL_SHELL, WINDOWS_64));
             map.put(TOOL_IMPORT_EXPORT, getToolSpec("https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-windows_amd64.zip", TOOL_IMPORT_EXPORT, WINDOWS_64));
             map.put(ALL_TOOLS, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/7.2.0-windows_64.zip", ALL_TOOLS, WINDOWS_64));
-            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_windows_amd64.zip", CB_MIGRATE, WINDOWS_64));
+            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_windows_amd64.zip", CB_MIGRATE, WINDOWS_64));
 
         } else if (WINDOWS_ARM.equals(os)) {
             map.put(TOOL_SHELL, getToolSpec("https://github.com/couchbaselabs/couchbase-shell/releases/download/v0.75.1/cbsh-x86_64-pc-windows-msvc.zip", TOOL_SHELL, WINDOWS_ARM));
             map.put(TOOL_IMPORT_EXPORT, getToolSpec("https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-windows_amd64.zip", TOOL_IMPORT_EXPORT, WINDOWS_ARM));
             map.put(ALL_TOOLS, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/7.2.0-windows_64.zip", ALL_TOOLS, WINDOWS_ARM));
-            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_windows_amd64.zip", CB_MIGRATE, WINDOWS_ARM));
+            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_windows_amd64.zip", CB_MIGRATE, WINDOWS_ARM));
 
         } else if (LINUX_64.equals(os)) {
             map.put(TOOL_SHELL, getToolSpec("https://github.com/couchbaselabs/couchbase-shell/releases/download/v0.75.1/cbsh-x86_64-unknown-linux-gnu.tar.gz", TOOL_SHELL, LINUX_64));
             map.put(TOOL_IMPORT_EXPORT, getToolSpec("https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-linux_x86_64.tar.gz", TOOL_IMPORT_EXPORT, LINUX_64));
             map.put(ALL_TOOLS, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/7.2.0-linux_64.zip", ALL_TOOLS, LINUX_64));
-            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_linux_amd64.zip", CB_MIGRATE, LINUX_64));
+            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_linux_amd64.zip", CB_MIGRATE, LINUX_64));
 
         } else if (LINUX_ARM.equals(os)) {
             map.put(TOOL_SHELL, getToolSpec("https://github.com/couchbaselabs/couchbase-shell/releases/download/v0.75.1/cbsh-aarch64-unknown-linux-gnu.tar.gz", TOOL_SHELL, LINUX_ARM));
             map.put(TOOL_IMPORT_EXPORT, getToolSpec("https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-linux_aarch64.tar.gz", TOOL_IMPORT_EXPORT, LINUX_ARM));
-            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_linux_arm64.zip", CB_MIGRATE, LINUX_ARM));
+            map.put(CB_MIGRATE, getToolSpec("https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_linux_arm64.zip", CB_MIGRATE, LINUX_ARM));
 
         } else {
             throw new IllegalStateException("OS not supported.");
@@ -130,30 +127,26 @@ public Map<String, ToolSpec> getDownloadList(String os) {
 
     private void cleanOldVersions(String configPath, String toolsPath, Map<String, ToolSpec> downloads) {
 
-        if (isInstalled(toolsPath, downloads.get(TOOL_SHELL), CBTools.Type.SHELL)
-                && !SHELL_VERSION.equals(getPropertyValue(configPath, SHELL_KEY))) {
+        if (isInstalled(toolsPath, downloads.get(TOOL_SHELL), CBTools.Type.SHELL) && !SHELL_VERSION.equals(getPropertyValue(configPath, SHELL_KEY))) {
             ToolSpec shell = downloads.get(TOOL_SHELL);
             Log.info("A new version of Couchbase Shell is available. Removing local version and downloading the new one");
             deleteFolder(toolsPath + File.separator + shell.getInstallationPath());
         }
 
-        if (isInstalled(toolsPath, downloads.get(TOOL_IMPORT_EXPORT), CBTools.Type.CB_EXPORT)
-                && !CBIMPORT_EXPORT_VERSION.equals(getPropertyValue(configPath, CBIMPORT_EXPORT_KEY))) {
+        if (isInstalled(toolsPath, downloads.get(TOOL_IMPORT_EXPORT), CBTools.Type.CB_EXPORT) && !CBIMPORT_EXPORT_VERSION.equals(getPropertyValue(configPath, CBIMPORT_EXPORT_KEY))) {
             Log.info("A new version of CB Import/Export is available. Removing local version and downloading the new one");
             ToolSpec cbImport = downloads.get(TOOL_IMPORT_EXPORT);
             deleteFolder(toolsPath + File.separator + cbImport.getInstallationPath());
         }
 
-        if (isInstalled(toolsPath, downloads.get(ALL_TOOLS), CBTools.Type.CBC_PILLOW_FIGHT)
-                && !TOOLS_VERSION.equals(getPropertyValue(configPath, TOOLS_KEY))) {
+        if (isInstalled(toolsPath, downloads.get(ALL_TOOLS), CBTools.Type.CBC_PILLOW_FIGHT) && !TOOLS_VERSION.equals(getPropertyValue(configPath, TOOLS_KEY))) {
             Log.info("A new version of Couchbase Tools is available. Removing local version and downloading the new one");
             ToolSpec cbTools = downloads.get(ALL_TOOLS);
             String toolsDir = toolsPath + File.separator + cbTools.getInstallationPath();
             deleteFolder(toolsDir);
         }
 
-        if (isInstalled(toolsPath, downloads.get(CB_MIGRATE), CBTools.Type.CBMIGRATE)
-                && !CBMIGRATE_VERSION.equals(getPropertyValue(configPath, CBMIGRATE_KEY))) {
+        if (isInstalled(toolsPath, downloads.get(CB_MIGRATE), CBTools.Type.CBMIGRATE) && !CBMIGRATE_VERSION.equals(getPropertyValue(configPath, CBMIGRATE_KEY))) {
             Log.info("A new version of Couchbase CBMIGRATE is available. Removing local version and downloading the new one");
             ToolSpec cbTools = downloads.get(CB_MIGRATE);
             String toolsDir = toolsPath + File.separator + cbTools.getInstallationPath();
@@ -174,8 +167,7 @@ public void downloadDependencies(String pluginConfigPath) throws Exception {
         String shellPath = toolsPath + File.separator + shell.getInstallationPath();
 
 
-        if (CBTools.getTool(CBTools.Type.SHELL).getStatus() == ToolStatus.NOT_AVAILABLE
-                && !isInstalled(toolsPath, downloads.get(TOOL_SHELL), CBTools.Type.SHELL)) {
+        if (CBTools.getTool(CBTools.Type.SHELL).getStatus() == ToolStatus.NOT_AVAILABLE && !isInstalled(toolsPath, downloads.get(TOOL_SHELL), CBTools.Type.SHELL)) {
             //avoiding 2 threads to install the same thing at the same time
             Log.info("Downloading CB Shell. The feature will be automatically enabled when the download is complete.");
             CBTools.getTool(CBTools.Type.SHELL).setStatus(ToolStatus.DOWNLOADING);
@@ -187,8 +179,7 @@ public void downloadDependencies(String pluginConfigPath) throws Exception {
 
         ToolSpec cbImport = downloads.get(TOOL_IMPORT_EXPORT);
         String cbImportDir = toolsPath + File.separator + cbImport.getInstallationPath();
-        if (CBTools.getTool(CBTools.Type.CB_IMPORT).getStatus() == ToolStatus.NOT_AVAILABLE
-                && !isInstalled(toolsPath, downloads.get(TOOL_IMPORT_EXPORT), CBTools.Type.CB_EXPORT)) {
+        if (CBTools.getTool(CBTools.Type.CB_IMPORT).getStatus() == ToolStatus.NOT_AVAILABLE && !isInstalled(toolsPath, downloads.get(TOOL_IMPORT_EXPORT), CBTools.Type.CB_EXPORT)) {
             //avoiding 2 threads to install the same thing at the same time
             Log.info("Downloading CB Import/Export. The feature will be automatically enabled when the download is complete.");
             CBTools.getTool(CBTools.Type.CB_EXPORT).setStatus(ToolStatus.DOWNLOADING);
@@ -202,8 +193,7 @@ public void downloadDependencies(String pluginConfigPath) throws Exception {
 
         ToolSpec cbTools = downloads.get(ALL_TOOLS);
         String toolsDir = toolsPath + File.separator + cbTools.getInstallationPath();
-        if (CBTools.getTool(CBTools.Type.CBC_PILLOW_FIGHT).getStatus() == ToolStatus.NOT_AVAILABLE
-                && !isInstalled(toolsPath, downloads.get(ALL_TOOLS), CBTools.Type.CBC_PILLOW_FIGHT)) {
+        if (CBTools.getTool(CBTools.Type.CBC_PILLOW_FIGHT).getStatus() == ToolStatus.NOT_AVAILABLE && !isInstalled(toolsPath, downloads.get(ALL_TOOLS), CBTools.Type.CBC_PILLOW_FIGHT)) {
 
             Log.info("Downloading CB tools. The feature will be automatically enabled when the download is complete.");
             CBTools.getTool(CBTools.Type.CBC_PILLOW_FIGHT).setStatus(ToolStatus.DOWNLOADING);
@@ -217,8 +207,7 @@ public void downloadDependencies(String pluginConfigPath) throws Exception {
 
         ToolSpec cbmigrate = downloads.get(CB_MIGRATE);
         String cbmigrateDir = toolsPath + File.separator + cbmigrate.getInstallationPath();
-        if (CBTools.getTool(CBTools.Type.CBMIGRATE).getStatus() == ToolStatus.NOT_AVAILABLE
-                && !isInstalled(toolsPath, downloads.get(CB_MIGRATE), CBTools.Type.CBMIGRATE)) {
+        if (CBTools.getTool(CBTools.Type.CBMIGRATE).getStatus() == ToolStatus.NOT_AVAILABLE && !isInstalled(toolsPath, downloads.get(CB_MIGRATE), CBTools.Type.CBMIGRATE)) {
 
             Log.info("Downloading CBMIGRATE. The feature will be automatically enabled when the download is complete.");
             CBTools.getTool(CBTools.Type.CBMIGRATE).setStatus(ToolStatus.DOWNLOADING);
@@ -251,8 +240,7 @@ public void downloadAndUnzip(String targetDir, ToolSpec spec, String configFolde
                 String fileName = spec.getUrl().substring(spec.getUrl().lastIndexOf("/") + 1);
                 String localFilePath = targetDir + File.separator + fileName;
                 URL website = new URL(spec.getUrl());
-                try (ReadableByteChannel rbc = Channels.newChannel(website.openStream());
-                     FileOutputStream fos = new FileOutputStream(localFilePath)) {
+                try (ReadableByteChannel rbc = Channels.newChannel(website.openStream()); FileOutputStream fos = new FileOutputStream(localFilePath)) {
                     fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
                 }
 
@@ -269,9 +257,6 @@ public void downloadAndUnzip(String targetDir, ToolSpec spec, String configFolde
     }
 
     public boolean isInstalled(String pluginPath, ToolSpec spec, CBTools.Type type) {
-        return Files.exists(Paths.get(pluginPath + File.separator
-                + spec.getInstallationPath()
-                + File.separator
-                + spec.getToolsMap().get(type)));
+        return Files.exists(Paths.get(pluginPath + File.separator + spec.getInstallationPath() + File.separator + spec.getToolsMap().get(type)));
     }
 }
diff --git a/src/main/java/com/couchbase/intellij/listener/DependenciesUtil.java b/src/main/java/com/couchbase/intellij/listener/DependenciesUtil.java
index 948fc658..cf665fa0 100644
--- a/src/main/java/com/couchbase/intellij/listener/DependenciesUtil.java
+++ b/src/main/java/com/couchbase/intellij/listener/DependenciesUtil.java
@@ -23,7 +23,7 @@ public class DependenciesUtil {
 
     public static final String TOOLS_VERSION = "7.2";
 
-    public static final String CBMIGRATE_VERSION = "4";
+    public static final String CBMIGRATE_VERSION = "5";
     public static final String SHELL_VERSION = "1";
     public static final String CBIMPORT_EXPORT_VERSION = "7.6";
     public static final String EXPLAIN_VERSION = "1";
@@ -96,7 +96,8 @@ public static void deleteFolder(String folderPath) {
         }
 
         try {
-            Files.walkFileTree(path, EnumSet.noneOf(FileVisitOption.class), Integer.MAX_VALUE, new SimpleFileVisitor<Path>() {
+            Files.walkFileTree(path, EnumSet.noneOf(FileVisitOption.class), Integer.MAX_VALUE,
+                    new SimpleFileVisitor<Path>() {
 
                 @Override
                 public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
diff --git a/src/main/java/com/couchbase/intellij/tools/PillowFightDialog.java b/src/main/java/com/couchbase/intellij/tools/PillowFightDialog.java
index 53d3bb4c..43f38b57 100644
--- a/src/main/java/com/couchbase/intellij/tools/PillowFightDialog.java
+++ b/src/main/java/com/couchbase/intellij/tools/PillowFightDialog.java
@@ -20,6 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
@@ -27,12 +28,13 @@
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.util.List;
-import java.util.function.Consumer;
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 public class PillowFightDialog extends DialogWrapper {
-    private static final String NETWORK_CONNECTIVITY_ERROR_MESSAGE = "Could not connect to the cluster. Please check your network connectivity, if the cluster is active or if the credentials are still valid.";
+    private static final String NETWORK_CONNECTIVITY_ERROR_MESSAGE = "Could not connect to the cluster. Please check "
+            + "your network connectivity, if the cluster is active or if the credentials are still valid.";
     private static final String COUCHBASE_PLUGIN_ERROR_MESSAGE = "Couchbase Plugin Error";
     private static final String DEFAULT_TAG = "_default";
     private static Balloon balloonHint;
@@ -144,7 +146,11 @@ public PillowFightDialog(Project project) {
         init();
     }
 
-    protected PillowFightDialog(Project project, String bucket, String durability, String persistTo, String batchSize, String numberItems, String keyPrefix, String numberThreads, String percentage, String noPopulation, String populateOnly, String minSize, String maxSize, String numberCycles, String sequential, String startAt, String timings, String expiry, String replicateTo, String lock, String json, String noop, String subdoc, String pathcount) {
+    protected PillowFightDialog(Project project, String bucket, String durability, String persistTo, String batchSize
+            , String numberItems, String keyPrefix, String numberThreads, String percentage, String noPopulation,
+                                String populateOnly, String minSize, String maxSize, String numberCycles,
+                                String sequential, String startAt, String timings, String expiry, String replicateTo,
+                                String lock, String json, String noop, String subdoc, String pathcount) {
         this(project);
 
         setValue(bucketComboBox, bucket);
@@ -204,7 +210,8 @@ private static void showBalloonHint(JBLabel questionMark, String hintText) {
         textArea.setColumns(40);
         textArea.setSize(textArea.getPreferredSize());
 
-        balloonHint = factory.createBalloonBuilder(textArea).setFillColor(UIManager.getColor("ToolTip.background")).setAnimationCycle(0).createBalloon();
+        balloonHint =
+                factory.createBalloonBuilder(textArea).setFillColor(UIManager.getColor("ToolTip.background")).setAnimationCycle(0).createBalloon();
         balloonHint.show(factory.guessBestPopupLocation(questionMark), Balloon.Position.below);
     }
 
@@ -217,9 +224,11 @@ private static void hideBalloonHint() {
 
     private void handleBucketComboBoxChange() {
         try {
-            String selectedBucket = Optional.ofNullable(bucketComboBox.getSelectedItem()).map(Object::toString).orElse(null);
+            String selectedBucket =
+                    Optional.ofNullable(bucketComboBox.getSelectedItem()).map(Object::toString).orElse(null);
 
-            Set<String> scopeNamesSet = ActiveCluster.getInstance().get().bucket(selectedBucket).collections().getAllScopes().stream().map(ScopeSpec::name).collect(Collectors.toSet());
+            Set<String> scopeNamesSet =
+                    ActiveCluster.getInstance().get().bucket(selectedBucket).collections().getAllScopes().stream().map(ScopeSpec::name).collect(Collectors.toSet());
             scopeComboBox.removeAllItems();
             for (String s : scopeNamesSet) {
                 scopeComboBox.addItem(s);
@@ -228,7 +237,8 @@ private void handleBucketComboBoxChange() {
             if (scopeComboBox.getItemCount() > 0) {
                 scopeComboBox.setSelectedIndex(0);
             } else {
-                Messages.showErrorDialog("The selectd bucket is empty. Selecting default scope and collection", "Empty Bucket");
+                Messages.showErrorDialog("The selectd bucket is empty. Selecting default scope and collection",
+                        "Empty Bucket");
                 scopeComboBox.setSelectedItem(DEFAULT_TAG);
                 collectionComboBox.setSelectedItem(DEFAULT_TAG);
 
@@ -242,8 +252,10 @@ private void handleBucketComboBoxChange() {
 
     private void handleScopeComboBoxChange() {
         try {
-            String selectedBucket = Optional.ofNullable(bucketComboBox.getSelectedItem()).map(Object::toString).orElse(null);
-            String selectedScope = Optional.ofNullable(scopeComboBox.getSelectedItem()).map(Object::toString).orElse(null);
+            String selectedBucket =
+                    Optional.ofNullable(bucketComboBox.getSelectedItem()).map(Object::toString).orElse(null);
+            String selectedScope =
+                    Optional.ofNullable(scopeComboBox.getSelectedItem()).map(Object::toString).orElse(null);
 
             if (selectedScope == null || selectedScope.isEmpty()) {
                 scopeComboBox.setSelectedItem(DEFAULT_TAG);
@@ -252,7 +264,8 @@ private void handleScopeComboBoxChange() {
             }
 
             Consumer<String> refreshCollectionCombo = scope -> {
-                String[] collectionNamesArray = ActiveCluster.getInstance().get().bucket(selectedBucket).collections().getAllScopes().stream().filter(s -> s.name().equals(scope)).flatMap(s -> s.collections().stream()).map(CollectionSpec::name).distinct().toArray(String[]::new);
+                String[] collectionNamesArray =
+                        ActiveCluster.getInstance().get().bucket(selectedBucket).collections().getAllScopes().stream().filter(s -> s.name().equals(scope)).flatMap(s -> s.collections().stream()).map(CollectionSpec::name).distinct().toArray(String[]::new);
                 collectionComboBox.removeAllItems();
                 for (String s : collectionNamesArray) {
                     collectionComboBox.addItem(s);
@@ -264,7 +277,8 @@ private void handleScopeComboBoxChange() {
             if (collectionComboBox.getItemCount() > 0) {
                 collectionComboBox.setSelectedIndex(0);
             } else {
-                Messages.showErrorDialog("The selectd scope is empty. Selecting default scope and collection", "Empty Bucket");
+                Messages.showErrorDialog("The selectd scope is empty. Selecting default scope and collection", "Empty"
+                        + " Bucket");
                 scopeComboBox.setSelectedItem(DEFAULT_TAG);
                 collectionComboBox.setSelectedItem(DEFAULT_TAG);
             }
@@ -316,21 +330,24 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbc.weightx = 0.0;
         gbc.weighty = 0.0;
 
-        panel.add(createLabelWithBalloon("Bucket:        ", "A bucket is the fundamental space for storing data in Couchbase Server"), gbc);
+        panel.add(createLabelWithBalloon("Bucket:        ",
+                "A bucket is the fundamental space for storing data in " + "Couchbase Server"), gbc);
 
         gbc.gridx++;
         panel.add(bucketComboBox, gbc);
 
         gbc.gridx--;
         gbc.gridy++;
-        panel.add(createLabelWithBalloon("Scope:        ", "A scope is a logical grouping of collections within a bucket"), gbc);
+        panel.add(createLabelWithBalloon("Scope:        ",
+                "A scope is a logical grouping of collections within a " + "bucket"), gbc);
 
         gbc.gridx++;
         panel.add(scopeComboBox, gbc);
 
         gbc.gridx--;
         gbc.gridy++;
-        panel.add(createLabelWithBalloon("Collection:        ", "A collection is a data container within a scope"), gbc);
+        panel.add(createLabelWithBalloon("Collection:        ", "A collection is a data container within a scope"),
+                gbc);
 
         gbc.gridx++;
         panel.add(collectionComboBox, gbc);
@@ -343,7 +360,8 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
 
         gbc.gridx--;
         gbc.gridy++;
-        panel.add(createLabelWithBalloon("Durability:        ", "Specify durability level for mutation operations"), gbc);
+        panel.add(createLabelWithBalloon("Durability:        ", "Specify durability level for mutation operations"),
+                gbc);
 
         gbc.gridx++;
         panel.add(durabilityComboBox, gbc);
@@ -364,7 +382,11 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
 
         collapsiblePanel.setVisible(false);
 
-        collapsiblePanel.add(createLabelWithBalloon("Persist-to: ", "Wait until the item has been persisted to at least NUMNODES nodes' disk. If NUMNODES is 1 then wait until only the master node has persisted the item for this key. You may not specify a number greater than the number of nodes actually in the cluster. -1 is special value, which mean to use all available nodes."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Persist-to: ",
+                "Wait until the item has been persisted to at " + "least NUMNODES nodes' disk. If NUMNODES is 1 then "
+                        + "wait until only the master node has persisted the " + "item for this key. You may not " +
+                        "specify a number greater than the number of nodes actually in the " + "cluster. -1 is " +
+                        "special value, which mean to use all available nodes."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(persistToSpinner, gbcCollapsable);
@@ -375,7 +397,9 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Batch Size: ", "This controls how many commands are scheduled per cycles. To simulate one operation at a time, set this value to 1."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Batch Size: ",
+                "This controls how many commands are scheduled " + "per cycles. To simulate one operation at a time, "
+                        + "set this value to 1."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(batchSizeSpinner, gbcCollapsable);
@@ -386,7 +410,8 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Number of Items: ", "Set the total number of items the workload will access within the cluster. This will also determine the working set size at the server and may affect disk latencies if set to a high number."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Number of Items: ", "Set the total number of items the workload "
+                + "will access within the cluster. This will also determine the working set size at the server and " + "may " + "affect disk latencies if set to a high number."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(numberItemsSpinner, gbcCollapsable);
@@ -397,7 +422,8 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Key Prefix: ", "Set the prefix to prepend to all keys in the cluster. Useful if you do not wish the items to conflict with existing data."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Key Prefix: ",
+                "Set the prefix to prepend to all keys in the " + "cluster. Useful if you do not wish the items to " + "conflict with existing data."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(keyPrefixTextField, gbcCollapsable);
@@ -405,7 +431,8 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
 
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Number of Threads: ", "Set the number of threads (and thus the number of client instances) to run concurrently. Each thread is assigned its own client object."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Number of Threads: ",
+                "Set the number of threads (and thus the " + "number of client instances) to run concurrently. Each " + "thread is assigned its own client object."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(numberThreadsSpinner, gbcCollapsable);
@@ -416,7 +443,9 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Percentage", "The percentage of operations which should be mutations. A value of 100 means only mutations while a value of 0 means only retrievals."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Percentage", "The percentage of operations which should be " +
+                "mutations. A value of 100 means only mutations while a value of 0 means only retrievals."),
+                gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(percentageSpinner, gbcCollapsable);
@@ -427,21 +456,26 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("No Population: ", "By default cbc-pillowfight will load all the items (see --num-items) into the cluster and then begin performing the normal workload. Specifying this option bypasses this stage. Useful if the items have already been loaded in a previous run."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("No Population: ", "By default cbc-pillowfight will load all the "
+                + "items (see --num-items) into the cluster and then begin performing the normal workload. " +
+                "Specifying" + " " + "this option bypasses this stage. Useful if the items have already been loaded " +
+                "in a previous " + "run."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(noPopulationComboBox, gbcCollapsable);
 
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Populate Only: ", "Stop after population. Useful to populate buckets with large amounts of data."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Populate Only: ",
+                "Stop after population. Useful to populate " + "buckets with large amounts of data."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(populateOnlyComboBox, gbcCollapsable);
 
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Min Size: ", "Specify the minimum size to be stored into the cluster. This is typically a range, in which case each value generated will be between Min Size and Max Size bytes."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Min Size: ",
+                "Specify the minimum size to be stored into the " + "cluster. This is typically a range, in which " + "case each value generated will be between Min Size and " + "Max Size bytes."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(minSizeSpinner, gbcCollapsable);
@@ -452,7 +486,8 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Max Size: ", "Specify the maximum size to be stored into the cluster. This is typically a range, in which case each value generated will be between Min Size and Max Size bytes."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Max Size: ",
+                "Specify the maximum size to be stored into the " + "cluster. This is typically a range, in which " + "case each value generated will be between Min Size and " + "Max Size bytes."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(maxSizeSpinner, gbcCollapsable);
@@ -463,7 +498,10 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Number of Cycles: ", "Specify the number of times the workload should cycle. During each cycle an amount of --batch-size operations are executed. Setting this to -1 will cause the workload to run infinitely."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Number of Cycles: ",
+                "Specify the number of times the workload " + "should cycle. During each cycle an amount of " +
+                        "--batch-size operations are executed. Setting this to " + "-1 will cause the workload to " +
+                        "run" + " infinitely."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(numberCyclesSpinner, gbcCollapsable);
@@ -474,14 +512,17 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Sequential: ", "Specify that the access pattern should be done in a sequential manner. This is useful for bulk-loading many documents in a single server."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Sequential: ",
+                "Specify that the access pattern should be done " + "in a sequential manner. This is useful for " +
+                        "bulk-loading many documents in a single server."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(sequentialComboBox, gbcCollapsable);
 
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Start At: ", "This specifies the starting offset for the items. The items by default are generated with the key prefix (--key-prefix) up to the number of items (--num-items). The --start-at value will increase the lower limit of the items. This is useful to resume a previously cancelled load operation."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Start At: ", "This specifies the starting offset for the items. "
+                + "The items by default are generated with the key prefix (--key-prefix) up to the number of items " + "(--num-items). The --start-at value will increase the lower limit of the items. This is useful to " + "resume a previously cancelled load operation."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(startAtSpinner, gbcCollapsable);
@@ -492,14 +533,17 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Timings: ", "Enabled timing recorded. Timing histogram will be dumped to STDERR on SIGQUIT (CTRL-/). When specified second time, it will dump a histogram of command timings and latencies to the screen every second."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Timings: ",
+                "Enabled timing recorded. Timing histogram will be " + "dumped to STDERR on SIGQUIT (CTRL-/). When " + "specified second time, it will dump a histogram of " + "command timings and latencies to the" + " screen every second."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(timingsComboBox, gbcCollapsable);
 
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Expiry: ", "Set the expiration time on the document for SECONDS when performing each operation. Note that setting this too low may cause not-found errors to appear on the screen."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Expiry: ", "Set the expiration time on the document for SECONDS "
+                + "when performing each operation. Note that setting this too low may cause not-found errors to " +
+                "appear " + "on the screen."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(expirySpinner, gbcCollapsable);
@@ -510,7 +554,8 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Replicate To: ", "Wait until the item has been replicated to at least NREPLICAS replica nodes. The bucket must be configured with at least one replica, and at least NREPLICAS replica nodes must be online. -1 is special value, which mean to use all available replicas."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Replicate To: ", "Wait until the item has been replicated to at "
+                + "least NREPLICAS replica nodes. The bucket must be configured with at least one replica, and at " + "least" + " NREPLICAS replica nodes must be online. -1 is special value, which mean to use all " + "available " + "replicas."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(replicateToSpinner, gbcCollapsable);
@@ -521,7 +566,9 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Lock: ", "This will retrieve and lock an item before update, making it inaccessible for modification until the update completed, or TIME has passed."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Lock: ",
+                "This will retrieve and lock an item before update, " + "making it inaccessible for modification " +
+                        "until the update completed, or TIME has passed."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(lockSpinner, gbcCollapsable);
@@ -532,28 +579,36 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         gbcCollapsable.gridx--;
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("JSON: ", "Make pillowfight store document as JSON rather than binary. This will allow the documents to nominally be analyzed by other Couchbase services such as Query and MapReduce."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("JSON: ",
+                "Make pillowfight store document as JSON rather than " + "binary. This will allow the documents to " + "nominally be analyzed by other Couchbase services such as " + "Query and MapReduce."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(jsonComboBox, gbcCollapsable);
 
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("NOOP: ", "Use couchbase NOOP operations when running the workload. This mode ignores population, and all other document operations. Useful as the most lightweight workload."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("NOOP: ", "Use couchbase NOOP operations when running the " +
+                "workload. This mode ignores population, and all other document operations. Useful as the most " +
+                "lightweight workload."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(noopComboBox, gbcCollapsable);
 
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Subdoc: ", "Use couchbase sub-document operations when running the workload. In this mode pillowfight will use Couchbase sub-document operations to perform gets and sets of data. This option must be used with --json"), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Subdoc: ",
+                "Use couchbase sub-document operations when running " + "the workload. In this mode pillowfight will "
+                        + "use Couchbase sub-document operations to perform gets " + "and sets of data. This option " + "must be used with --json"), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(subdocComboBox, gbcCollapsable);
 
         gbcCollapsable.gridx--;
         gbcCollapsable.gridy++;
-        collapsiblePanel.add(createLabelWithBalloon("Pathcount: ", "Specify the number of paths a single sub-document operation should contain. By default, each subdoc operation operates on only a single path within the document. You can specify multiple paths to atomically executed multiple subdoc operations within a single command."), gbcCollapsable);
+        collapsiblePanel.add(createLabelWithBalloon("Pathcount: ", "Specify the number of paths a single " + "sub" +
+                "-document" + " operation should contain. By default, each subdoc operation operates on only a " +
+                "single path within " + "the document. You can specify multiple paths to atomically executed " +
+                "multiple" + " subdoc operations " + "within a single command."), gbcCollapsable);
 
         gbcCollapsable.gridx++;
         collapsiblePanel.add(pathcountSpinner, gbcCollapsable);
@@ -572,6 +627,7 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
         errorMessage.setForeground(Color.decode("#FF4444"));
         panel.add(errorMessage, gbc);
 
+        panel.setBorder(new EmptyBorder(0, 15, 0, 20));
         JBScrollPane jbScrollPane = new JBScrollPane(panel);
         jbScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 
@@ -581,7 +637,8 @@ private void setValue(JSpinner spinner, String value, JCheckBox checkBox) {
             @Override
             public void componentResized(ComponentEvent e) {
                 if (collapsiblePanel1.contentIsEnabled()) {
-                    jbScrollPane.setPreferredSize(new Dimension(jbScrollWidth, (int) (Toolkit.getDefaultToolkit().getScreenSize().height * 0.8)));
+                    jbScrollPane.setPreferredSize(new Dimension(jbScrollWidth,
+                            (int) (Toolkit.getDefaultToolkit().getScreenSize().height * 0.8)));
                 } else {
                     jbScrollPane.setPreferredSize(new Dimension(jbScrollWidth, jbScrollOriginalHeight));
                 }
@@ -625,7 +682,7 @@ protected void doOKAction() {
 
         try {
             if (componentIsEnabled(lockSpinner) && componentIsEnabled(numberItemsSpinner) && componentIsEnabled(batchSizeSpinner) && componentIsEnabled(numberThreadsSpinner) && (int) numberItemsSpinner.getValue() < (int) batchSizeSpinner.getValue() * (int) numberThreadsSpinner.getValue()) {
-                errors.add("Number of Items cannot be smaller than Batch Size multiplied to Number of Threads when used with Lock");
+                errors.add("Number of Items cannot be smaller than Batch Size multiplied to Number of Threads when " + "used with Lock");
             }
         } catch (Exception e) {
             Log.error(e);
@@ -635,7 +692,15 @@ protected void doOKAction() {
             super.doOKAction();
             try {
                 PillowFightRunner pillowFightRunner = new PillowFightRunner();
-                pillowFightRunner.runPillowFightCommand(project, getValue(bucketComboBox), getValue(scopeComboBox), getValue(collectionComboBox), getValue(durabilityComboBox), getValue(persistToSpinner), getValue(batchSizeSpinner), getValue(numberItemsSpinner), keyPrefixTextField.getText(), getValue(numberThreadsSpinner), getValue(percentageSpinner), getValue(noPopulationComboBox), getValue(populateOnlyComboBox), getValue(minSizeSpinner), getValue(maxSizeSpinner), getValue(numberCyclesSpinner), getValue(sequentialComboBox), getValue(startAtSpinner), getValue(timingsComboBox), getValue(expirySpinner), getValue(replicateToSpinner), getValue(lockSpinner), getValue(jsonComboBox), getValue(noopComboBox), getValue(subdocComboBox), getValue(pathcountSpinner));
+                pillowFightRunner.runPillowFightCommand(project, getValue(bucketComboBox), getValue(scopeComboBox),
+                        getValue(collectionComboBox), getValue(durabilityComboBox), getValue(persistToSpinner),
+                        getValue(batchSizeSpinner), getValue(numberItemsSpinner), keyPrefixTextField.getText(),
+                        getValue(numberThreadsSpinner), getValue(percentageSpinner), getValue(noPopulationComboBox),
+                        getValue(populateOnlyComboBox), getValue(minSizeSpinner), getValue(maxSizeSpinner),
+                        getValue(numberCyclesSpinner), getValue(sequentialComboBox), getValue(startAtSpinner),
+                        getValue(timingsComboBox), getValue(expirySpinner), getValue(replicateToSpinner),
+                        getValue(lockSpinner), getValue(jsonComboBox), getValue(noopComboBox),
+                        getValue(subdocComboBox), getValue(pathcountSpinner));
 
             } catch (IOException | InterruptedException e) {
                 throw new RuntimeException(e);
diff --git a/src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrateDynamo.java b/src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrateDynamo.java
new file mode 100644
index 00000000..5e84b967
--- /dev/null
+++ b/src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrateDynamo.java
@@ -0,0 +1,175 @@
+package com.couchbase.intellij.tools.cbmigrate;
+
+import com.couchbase.intellij.tools.CBTools;
+import com.couchbase.intellij.workbench.Log;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static utils.ProcessUtils.printOutput;
+
+public class CBMigrateDynamo {
+
+    private CBMigrateDynamo() {
+    }
+
+    public static void migrateMultipleCollections(Project project, List<CBMigrateDynamoCommandBuilder> builders) {
+
+        ProgressManager.getInstance().run(new Task.Backgroundable(project, "Migrating DynamoDB to Couchbase", true) {
+            @Override
+            public void run(@NotNull ProgressIndicator indicator) {
+
+                indicator.setIndeterminate(true);
+                indicator.setText("Migrating data from DynamoDB to Couchbase");
+
+                List<String> successfulMigrations = new ArrayList<>();
+                List<String> failedMigrations = new ArrayList<>();
+
+                for (CBMigrateDynamoCommandBuilder builder : builders) {
+                    String collectionName = builder.commandList.get(builder.commandList.indexOf("--dynamodb-table" + "-name") + 1);
+                    try {
+                        ProcessBuilder processBuilder = new ProcessBuilder(builder.build());
+                        Log.debug("Running command: " + String.join(" ", builder.commandList));
+                        Process process = processBuilder.start();
+                        printOutput(process, "Migrating DynamoDB's table \"" + collectionName + "\" to " + "Couchbase" + ":" + " ");
+                        int exitCode = process.waitFor();
+                        if (exitCode == 0) {
+                            Log.info("Successfully migrated DynamoDB table " + collectionName + " to Couchbase");
+                            successfulMigrations.add(collectionName);
+                        } else {
+                            Log.error("An error occurred while migrating collection " + collectionName);
+                            failedMigrations.add(collectionName);
+                        }
+                    } catch (Exception ex) {
+                        Log.error("Error while migrating DynamoDB to Couchbase", ex);
+                        failedMigrations.add(collectionName);
+                    }
+                }
+
+                ApplicationManager.getApplication().invokeLater(() -> {
+                    if (failedMigrations.isEmpty()) {
+                        Messages.showInfoMessage(project, "Successfully migrated all Dynamo collections to " + "Couchbase", "Migration Successful");
+                    } else {
+                        if (!failedMigrations.isEmpty()) {
+                            Messages.showErrorDialog(project, "An error occurred while migrating " + failedMigrations.size() + " of " + successfulMigrations.size() + " collections.\n" + "The failure(s) occurred while migrating the following collections: " + String.join(", ", failedMigrations) + ".\nPlease check the log for more.", "Migration Failed");
+                        }
+                    }
+                });
+
+            }
+        });
+    }
+
+    public static class CBMigrateDynamoCommandBuilder {
+
+        private final List<String> commandList = new ArrayList<>();
+
+        public CBMigrateDynamoCommandBuilder() {
+
+            commandList.add(CBTools.getTool(CBTools.Type.CBMIGRATE).getPath());
+            commandList.add("dynamodb");
+        }
+
+        public CBMigrateDynamoCommandBuilder setAwsProfile(String profile) {
+            commandList.add("--aws-profile");
+            commandList.add(profile);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setAwsRegion(String region) {
+            commandList.add("--aws-region");
+            commandList.add(region);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setDynamoTable(String table) {
+            commandList.add("--dynamodb-table-name");
+            commandList.add(table);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setAwsAccessKey(String accessKey) {
+            commandList.add("--aws-access-key-id");
+            commandList.add(accessKey);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setAwsAccessKeySecret(String accessKeySecret) {
+            commandList.add("--aws-secret-access-key");
+            commandList.add(accessKeySecret);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setCBCluster(String cluster) {
+            commandList.add("--cb-cluster");
+            commandList.add(cluster);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setCBUsername(String username) {
+            commandList.add("--cb-username");
+            commandList.add(username);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setCBPassword(String password) {
+            commandList.add("--cb-password");
+            commandList.add(password);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setCBBucket(String bucket) {
+            commandList.add("--cb-bucket");
+            commandList.add(bucket);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setCBScope(String scope) {
+            commandList.add("--cb-scope");
+            commandList.add(scope);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setCBCollection(String collection) {
+            commandList.add("--cb-collection");
+            commandList.add(collection);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setCBGenerateKey(String key) {
+            commandList.add("--cb-generate-key");
+            commandList.add(key);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setCopyIndexes(String key) {
+            commandList.add("--copy-indexes");
+            commandList.add(key);
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setVerbose() {
+            commandList.add("--debug");
+            return this;
+        }
+
+        public CBMigrateDynamoCommandBuilder setSslNoVerify() {
+            commandList.add("--cb-no-ssl-verify");
+            commandList.add("true");
+            return this;
+        }
+
+        public List<String> build() {
+            return commandList;
+        }
+
+    }
+
+}
diff --git a/src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrate.java b/src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrateMongo.java
similarity index 98%
rename from src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrate.java
rename to src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrateMongo.java
index c1cd6bdc..22d85475 100644
--- a/src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrate.java
+++ b/src/main/java/com/couchbase/intellij/tools/cbmigrate/CBMigrateMongo.java
@@ -15,9 +15,9 @@
 
 import static utils.ProcessUtils.printOutput;
 
-public class CBMigrate {
+public class CBMigrateMongo {
 
-    private CBMigrate() {
+    private CBMigrateMongo() {
     }
 
     public static class CBMigrateCommandBuilder {
diff --git a/src/main/java/com/couchbase/intellij/tools/cbmigrate/DynamoConnection.java b/src/main/java/com/couchbase/intellij/tools/cbmigrate/DynamoConnection.java
new file mode 100644
index 00000000..7ba00d54
--- /dev/null
+++ b/src/main/java/com/couchbase/intellij/tools/cbmigrate/DynamoConnection.java
@@ -0,0 +1,68 @@
+package com.couchbase.intellij.tools.cbmigrate;
+
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.profiles.Profile;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.ListTablesRequest;
+import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
+
+import java.nio.file.Paths;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class DynamoConnection {
+
+    public static List<String> listTables(String region, String awsAccessKeyId, String awsSecretAccessKey) {
+        DynamoDbClient ddb = null;
+        try {
+            AwsBasicCredentials awsCreds = AwsBasicCredentials.create(awsAccessKeyId, awsSecretAccessKey);
+            ddb = DynamoDbClient.builder().region(Region.of(region))
+                                .credentialsProvider(StaticCredentialsProvider.create(awsCreds)).build();
+            return listTables(ddb);
+        } finally {
+            if (ddb != null) {
+                ddb.close();
+            }
+        }
+    }
+
+    public static List<String> listTables(String region, String profile) {
+        DynamoDbClient ddb = null;
+        try {
+            ddb = DynamoDbClient.builder().region(Region.of(region))
+                                .credentialsProvider(ProfileCredentialsProvider.create(profile)).build();
+            return listTables(ddb);
+        } finally {
+            if (ddb != null) {
+                ddb.close();
+            }
+        }
+    }
+
+
+    public static Set<String> listProfiles() {
+
+        try {
+            ProfileFile profileFile = ProfileFile.builder().content(
+                                                         Paths.get(System.getProperty("user.home"), ".aws", "credentials"))
+                                                 .type(ProfileFile.Type.CREDENTIALS).build();
+            Map<String, Profile> profiles = profileFile.profiles();
+            return profiles.keySet();
+        } catch (Exception e) {
+            return new HashSet<>();
+        }
+    }
+
+    private static List<String> listTables(DynamoDbClient ddb) {
+        ListTablesRequest request = ListTablesRequest.builder().build();
+        ListTablesResponse response = ddb.listTables(request);
+        return response.tableNames();
+    }
+
+}
diff --git a/src/main/java/com/couchbase/intellij/tools/cbmigrate/DynamoMigrationDialog.java b/src/main/java/com/couchbase/intellij/tools/cbmigrate/DynamoMigrationDialog.java
new file mode 100644
index 00000000..7dac8096
--- /dev/null
+++ b/src/main/java/com/couchbase/intellij/tools/cbmigrate/DynamoMigrationDialog.java
@@ -0,0 +1,670 @@
+package com.couchbase.intellij.tools.cbmigrate;
+
+import com.couchbase.client.java.manager.collection.ScopeSpec;
+import com.couchbase.intellij.database.ActiveCluster;
+import com.couchbase.intellij.tools.dialog.JComboCheckBox;
+import com.couchbase.intellij.tree.docfilter.DocumentFilterDialog;
+import com.couchbase.intellij.workbench.Log;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.ComboBox;
+import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.ui.TitledSeparator;
+import com.intellij.util.ui.JBUI;
+import org.jetbrains.annotations.NotNull;
+import utils.TemplateUtil;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+public class DynamoMigrationDialog extends DialogWrapper {
+
+    public static final String ALL_TABLES_IN_THE_DATABASE = "All tables in the database";
+    public static final String NO_PROFILES_FOUND = "No profiles found";
+    protected static final Color ERROR_COLOR = Color.decode("#FF4444");
+    protected static final Color SUCCESS_COLOR = Color.decode("#00C851");
+    protected static final Color ESTABILISHING_COLOR = Color.decode("#FFA726");
+    private final Project project;
+    protected ComboBox<AWSRegion> regionBox;
+    protected JComboCheckBox tablesCombobox;
+    protected ComboBox<String> targetBucketCombo;
+    protected ComboBox<String> targetScopeCombo;
+    protected List<ScopeSpec> targetScopeItems;
+    private JRadioButton awsProfileButton;
+    private JPanel cardPanel;
+    private CardLayout cardLayout;
+    private JComboBox<String> profileBox;
+    private JTextField accessKeyField;
+    private JTextField secretKeyField;
+    private JLabel connectionError = new JLabel("");
+    private JCheckBox migrateIdxCheckBox;
+    private JCheckBox verboseModeCheckbox;
+    private JCheckBox sslNoVerifyCheckbox;
+
+    public DynamoMigrationDialog(Project project) {
+        super(true);
+        this.project = project;
+        init();
+        setTitle("DynamoDB To Couchbase Migration - Beta");
+        getWindow().setMinimumSize(new Dimension(600, 400));
+        setResizable(true);
+    }
+
+    private static List<AWSRegion> getRegions() {
+        List<AWSRegion> regions = new ArrayList<>();
+        regions.add(new AWSRegion("US East (N. Virginia)", "us-east-1"));
+        regions.add(new AWSRegion("US East (Ohio)", "us-east-2"));
+        regions.add(new AWSRegion("US West (N. California)", "us-west-1"));
+        regions.add(new AWSRegion("US West (Oregon)", "us-west-2"));
+        regions.add(new AWSRegion("Africa (Cape Town)", "af-south-1"));
+        regions.add(new AWSRegion("Asia Pacific (Hong Kong)", "ap-east-1"));
+        regions.add(new AWSRegion("Asia Pacific (Mumbai)", "ap-south-1"));
+        regions.add(new AWSRegion("Asia Pacific (Osaka)", "ap-northeast-3"));
+        regions.add(new AWSRegion("Asia Pacific (Seoul)", "ap-northeast-2"));
+        regions.add(new AWSRegion("Asia Pacific (Singapore)", "ap-southeast-1"));
+        regions.add(new AWSRegion("Asia Pacific (Sydney)", "ap-southeast-2"));
+        regions.add(new AWSRegion("Asia Pacific (Tokyo)", "ap-northeast-1"));
+        regions.add(new AWSRegion("Canada (Central)", "ca-central-1"));
+        regions.add(new AWSRegion("China (Beijing)", "cn-north-1"));
+        regions.add(new AWSRegion("China (Ningxia)", "cn-northwest-1"));
+        regions.add(new AWSRegion("Europe (Frankfurt)", "eu-central-1"));
+        regions.add(new AWSRegion("Europe (Ireland)", "eu-west-1"));
+        regions.add(new AWSRegion("Europe (London)", "eu-west-2"));
+        regions.add(new AWSRegion("Europe (Milan)", "eu-south-1"));
+        regions.add(new AWSRegion("Europe (Paris)", "eu-west-3"));
+        regions.add(new AWSRegion("Europe (Stockholm)", "eu-north-1"));
+        regions.add(new AWSRegion("Middle East (Bahrain)", "me-south-1"));
+        regions.add(new AWSRegion("South America (São Paulo)", "sa-east-1"));
+
+        return regions;
+    }
+
+    private void showConnectionError(String message) {
+        connectionError.setText(message);
+        connectionError.setVisible(true);
+        connectionError.setForeground(ERROR_COLOR);
+    }
+
+    @Override
+    protected JComponent createCenterPanel() {
+
+        cardLayout = new CardLayout();
+        cardPanel = new JPanel(cardLayout);
+
+        cardPanel.add(creteConnectionPanel(), "0");
+        cardPanel.add(createDataSourcePanel(), "1");
+        cardPanel.add(createTargetPanel(), "2");
+
+        return cardPanel;
+    }
+
+    private JPanel creteConnectionPanel() {
+
+
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.fill = GridBagConstraints.BOTH;
+        gbc.anchor = GridBagConstraints.NORTHWEST;
+        gbc.weightx = 0.05;
+        gbc.weighty = 0;
+        gbc.insets = JBUI.insets(5);
+
+        JPanel mongoDBPanel = new JPanel(new GridBagLayout());
+
+        JLabel infoLabel = new JLabel();
+
+        infoLabel.setIcon(IconLoader.getIcon("/assets/icons/information_big.svg", DocumentFilterDialog.class));
+
+        infoLabel.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                String content = """
+                        <html>
+                        <h2>DynamoDB Connection</h2>
+                           <p>Select the AWS Region, the AWS profile or the key/secret to connect to your Dynamo DB</p>
+                           <br>
+                        Check the CLI tool for additional options <a href='https://github.com/couchbaselabs/cbmigrate'>here</a>
+                        <br>
+                        </html>""";
+
+                TemplateUtil.showGotItTooltip(e.getComponent(), content);
+            }
+        });
+
+        JPanel helpPanel = new JPanel();
+        helpPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
+        helpPanel.add(infoLabel);
+
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.gridwidth = 4;
+        mongoDBPanel.add(helpPanel, gbc);
+
+        JLabel regionLabel = new JLabel("AWS Region");
+        gbc.gridx = 0;
+        gbc.gridy++;
+        gbc.gridwidth = 1;
+        mongoDBPanel.add(regionLabel, gbc);
+
+        DefaultComboBoxModel<AWSRegion> model = new DefaultComboBoxModel<>();
+        for (AWSRegion region : getRegions()) {
+            model.addElement(region);
+        }
+
+        regionBox = new ComboBox<>(model);
+        regionBox.setSelectedItem(null);
+
+        gbc.gridx = 1;
+        gbc.weightx = 0.95;
+        gbc.gridwidth = 3;
+        mongoDBPanel.add(regionBox, gbc);
+
+
+        awsProfileButton = new JRadioButton("AWS Profile");
+        JRadioButton accessKeyButton = new JRadioButton("Access Key/Secret Key");
+
+        ButtonGroup group = new ButtonGroup();
+        group.add(awsProfileButton);
+        group.add(accessKeyButton);
+
+        JPanel radioPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        radioPanel.add(awsProfileButton);
+        radioPanel.add(accessKeyButton);
+        radioPanel.setBorder(JBUI.Borders.emptyTop(10));
+
+        gbc.gridx = 0;
+        gbc.gridy++;
+        gbc.gridwidth = 4;
+        mongoDBPanel.add(radioPanel, gbc);
+
+        Set<String> profiles = DynamoConnection.listProfiles();
+        awsProfileButton.setSelected(!profiles.isEmpty());
+        accessKeyButton.setSelected(profiles.isEmpty());
+
+        JPanel dynamicPanel = new JPanel(new GridBagLayout());
+        GridBagConstraints dynamicGbc = new GridBagConstraints();
+        dynamicGbc.fill = GridBagConstraints.BOTH;
+        dynamicGbc.anchor = GridBagConstraints.NORTHWEST;
+        dynamicGbc.weightx = 0.05;
+        dynamicGbc.weighty = 0;
+        dynamicGbc.insets = new Insets(5, 5, 5, 5);
+
+        awsProfileButton.addActionListener(e -> showAWSProfilePanel(dynamicPanel, dynamicGbc));
+
+        accessKeyButton.addActionListener(e -> showAccessKeyPanel(dynamicPanel, dynamicGbc));
+
+        gbc.gridx = 0;
+        gbc.gridy++;
+        gbc.gridwidth = 4;
+        mongoDBPanel.add(dynamicPanel, gbc);
+
+        if (!profiles.isEmpty()) {
+            showAWSProfilePanel(dynamicPanel, dynamicGbc);
+        } else {
+            showAccessKeyPanel(dynamicPanel, dynamicGbc);
+        }
+
+
+        JPanel southErrorPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        southErrorPanel.add(connectionError);
+
+        JButton button = new JButton("Next");
+        button.addActionListener(e -> {
+
+            if (regionBox.getSelectedItem() == null) {
+                showConnectionError("Select an AWS Region");
+            }
+            connectionError.setText("Loading tables...");
+            connectionError.setForeground(ESTABILISHING_COLOR);
+            connectionError.setVisible(true);
+
+            List<String> tables = null;
+
+            if (awsProfileButton.isSelected()) {
+                if (profileBox.getSelectedItem().toString().equals(NO_PROFILES_FOUND)) {
+                    showConnectionError("You must have a valid AWS profile configured to use this option");
+                    return;
+                } else {
+                    try {
+                        tables = DynamoConnection.listTables(((AWSRegion) regionBox.getSelectedItem()).getCode(), profileBox
+                                .getSelectedItem().toString());
+                    } catch (Exception ex) {
+                        Log.error("An error occurred while trying to connect to a DynamoDB instance", ex);
+                        showConnectionError("An error occurred while trying to connect to a DynamoDB instance. Check " + "the logs for more details.");
+                        return;
+                    }
+                }
+            } else {
+                if (accessKeyField.getText().trim().isEmpty() || secretKeyField.getText().trim().isEmpty()) {
+                    showConnectionError("Please inform the AWS Key and Secret Key");
+                    return;
+                } else {
+                    try {
+                        tables = DynamoConnection.listTables(((AWSRegion) regionBox.getSelectedItem()).getCode(), accessKeyField
+                                .getText().trim(), secretKeyField.getText().trim());
+                    } catch (Exception ex) {
+                        Log.error("An error occurred while trying to connect to a DynamoDB instance", ex);
+                        showConnectionError("An error occurred while trying to connect to a DynamoDB instance. Check " + "the logs for more details.");
+                        return;
+                    }
+                }
+            }
+
+            if (tables == null || tables.isEmpty()) {
+                showConnectionError("No DynamoDB tables found for the selected region and credentials");
+                return;
+            } else {
+                showDataSourcePanel(tables);
+            }
+            connectionError.setText("");
+
+        });
+        JButton cancel = new JButton("Cancel");
+        cancel.addActionListener(e -> {
+            super.doCancelAction();
+        });
+
+        JPanel southButtonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        southButtonPanel.add(cancel);
+        southButtonPanel.add(button);
+
+        JPanel southPanel = new JPanel();
+        southPanel.setLayout(new BoxLayout(southPanel, BoxLayout.Y_AXIS));
+        southPanel.add(southErrorPanel);
+        southPanel.add(southButtonPanel);
+
+
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(mongoDBPanel, BorderLayout.NORTH);
+        panel.add(southPanel, BorderLayout.SOUTH);
+
+        return panel;
+    }
+
+    private void showAccessKeyPanel(JPanel panel, GridBagConstraints gbc) {
+        panel.removeAll();
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.gridwidth = 1;
+        panel.add(new JLabel("AWS Access Key"), gbc);
+
+        accessKeyField = new JTextField(20);
+        gbc.gridx = 1;
+        gbc.gridwidth = 3;
+        panel.add(accessKeyField, gbc);
+
+        gbc.gridx = 0;
+        gbc.gridy++;
+        gbc.gridwidth = 1;
+        panel.add(new JLabel("AWS Secret Key"), gbc);
+
+        secretKeyField = new JTextField(20);
+        gbc.gridx = 1;
+        gbc.gridwidth = 3;
+        panel.add(secretKeyField, gbc);
+
+        panel.revalidate();
+        panel.repaint();
+    }
+
+    private void showAWSProfilePanel(JPanel panel, GridBagConstraints gbc) {
+        panel.removeAll();
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.gridwidth = 1;
+        panel.add(new JLabel("Profile"), gbc);
+
+        Set<String> profiles = DynamoConnection.listProfiles();
+
+        if (!profiles.isEmpty()) {
+            profileBox = new ComboBox<>(profiles.toArray(new String[profiles.size()]));
+        } else {
+            profileBox = new ComboBox<>(new String[]{NO_PROFILES_FOUND});
+        }
+
+        gbc.gridx = 1;
+        gbc.gridwidth = 3;
+        panel.add(profileBox, gbc);
+
+        panel.revalidate();
+        panel.repaint();
+    }
+
+    private void showDataSourcePanel(List<String> tables) {
+
+        tablesCombobox.removeAllItems();
+        tablesCombobox.addItem(ALL_TABLES_IN_THE_DATABASE);
+        for (String tableName : tables) {
+            tablesCombobox.addItem(tableName);
+        }
+        cardLayout.show(cardPanel, "1");
+
+    }
+
+    private JPanel createDataSourcePanel() {
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.fill = GridBagConstraints.BOTH;
+        gbc.anchor = GridBagConstraints.NORTHWEST;
+        gbc.weightx = 0.05;
+        gbc.weighty = 0;
+        gbc.insets = JBUI.insets(5);
+
+        JPanel dataSourcePanel = new JPanel(new GridBagLayout());
+
+        JLabel infoLabel = new JLabel();
+        infoLabel.setIcon(IconLoader.getIcon("/assets/icons/information_big.svg", DynamoMigrationDialog.class));
+        infoLabel.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                String content = """
+                        <html>
+                        <h2>Data Source Information</h2>
+                        <div>
+                          Select the tables that you would like to migrate from Dynamo to Couchbase
+                         </div>
+                        <br>
+                        Check the CLI tool for additional options <a href='https://github.com/couchbaselabs/cbmigrate'>here</a>
+                        <br>
+                         </html>""";
+
+                TemplateUtil.showGotItTooltip(e.getComponent(), content);
+            }
+        });
+
+        JPanel helpPanel = new JPanel();
+        helpPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
+        helpPanel.add(infoLabel);
+
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.gridwidth = 2;
+        dataSourcePanel.add(helpPanel, gbc);
+
+        TitledSeparator dataSourceSeparator = new TitledSeparator("Data Source");
+        gbc.gridx = 0;
+        gbc.gridy++;
+        dataSourcePanel.add(dataSourceSeparator, gbc);
+
+        JLabel databaseLabel = new JLabel("Select the tables to migrate");
+        gbc.gridy++;
+        gbc.gridwidth = 1;
+        dataSourcePanel.add(databaseLabel, gbc);
+
+        tablesCombobox = new JComboCheckBox();
+        gbc.gridx = 1;
+        gbc.weightx = 0.95;
+        dataSourcePanel.add(tablesCombobox, gbc);
+
+        migrateIdxCheckBox = new JCheckBox("Migrate indexes definitions");
+        migrateIdxCheckBox.setSelected(true);
+        gbc.gridx = 0;
+        gbc.gridy++;
+        gbc.gridwidth = 2;
+        dataSourcePanel.add(migrateIdxCheckBox, gbc);
+
+        sslNoVerifyCheckbox = new JCheckBox("SSL No Verify");
+        sslNoVerifyCheckbox.setSelected(false);
+        gbc.gridx = 0;
+        gbc.gridy++;
+        gbc.gridwidth = 2;
+        dataSourcePanel.add(sslNoVerifyCheckbox, gbc);
+
+        verboseModeCheckbox = new JCheckBox("Enable verbose mode");
+        verboseModeCheckbox.setSelected(false);
+        gbc.gridx = 0;
+        gbc.gridy++;
+        gbc.gridwidth = 2;
+        dataSourcePanel.add(verboseModeCheckbox, gbc);
+
+        JLabel errorLabel = new JLabel();
+        JPanel southErrorPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        southErrorPanel.add(errorLabel);
+
+        JButton button = new JButton("Next");
+        button.addActionListener(e -> {
+            List<String> selectedCols = tablesCombobox.getSelectedItems();
+            if (selectedCols.isEmpty()) {
+                errorLabel.setForeground(ERROR_COLOR);
+                errorLabel.setText("Please select at least one table");
+                return;
+            }
+            cardLayout.show(cardPanel, "2");
+        });
+        JButton back = new JButton("Back");
+        back.addActionListener(e -> {
+            cardLayout.show(cardPanel, "0");
+        });
+
+        JPanel southButtonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        southButtonPanel.add(back);
+        southButtonPanel.add(button);
+
+        JPanel southPanel = new JPanel();
+        southPanel.setLayout(new BoxLayout(southPanel, BoxLayout.Y_AXIS));
+        southPanel.add(southErrorPanel);
+        southPanel.add(southButtonPanel);
+
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(dataSourcePanel, BorderLayout.NORTH);
+        panel.add(southPanel, BorderLayout.SOUTH);
+
+        return panel;
+    }
+
+    private JPanel createTargetPanel() {
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.fill = GridBagConstraints.BOTH;
+        gbc.anchor = GridBagConstraints.NORTHWEST;
+        gbc.weightx = 0.05;
+        gbc.weighty = 0;
+        gbc.insets = JBUI.insets(5);
+
+        JPanel targetPanel = new JPanel(new GridBagLayout());
+
+        JLabel infoLabel = new JLabel();
+        infoLabel.setIcon(IconLoader.getIcon("/assets/icons/information_big.svg", DynamoMigrationDialog.class));
+        infoLabel.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                String content = """
+                        <html><h2>Target Information</h2>
+                        <div>
+                        The target panel allows you to specify the destination for the migrated data. You can select the target bucket and scope where the data will be migrated to.
+                        <h3>Bucket</h3>
+                        Choose the destination bucket for the migration.
+                        <h3>Scope</h3>
+                        Select the scope within the chosen bucket where the data will be migrated.
+                        </div>
+                        <br>
+                        Check the CLI tool for additional options <a href='https://github.com/couchbaselabs/cbmigrate'>here</a>
+                        <br>
+                        </html>""";
+
+                TemplateUtil.showGotItTooltip(e.getComponent(), content);
+            }
+        });
+
+        JPanel helpPanel = new JPanel();
+        helpPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
+        helpPanel.add(infoLabel);
+
+        gbc.gridx = 0;
+        gbc.gridy = 0;
+        gbc.gridwidth = 2;
+        targetPanel.add(helpPanel, gbc);
+
+        TitledSeparator bucketSeparator = new TitledSeparator("Target");
+        gbc.gridx = 0;
+        gbc.gridy++;
+        targetPanel.add(bucketSeparator, gbc);
+
+        JLabel bucketLabel = new JLabel("Bucket");
+        gbc.gridy++;
+        gbc.gridwidth = 1;
+        targetPanel.add(bucketLabel, gbc);
+
+        targetBucketCombo = new ComboBox<>();
+        gbc.gridx = 1;
+        gbc.weightx = 0.95;
+
+        Set<String> bucketSet = ActiveCluster.getInstance().get().buckets().getAllBuckets().keySet();
+        String[] buckets = bucketSet.toArray(new String[0]);
+        targetBucketCombo.setModel(new DefaultComboBoxModel<>(buckets));
+        targetBucketCombo.setSelectedItem(null);
+        targetPanel.add(targetBucketCombo, gbc);
+
+        targetBucketCombo.addActionListener(e -> {
+            String selectedBucket = (String) targetBucketCombo.getSelectedItem();
+            if (selectedBucket != null) {
+                targetScopeItems = new ArrayList<>();
+                targetScopeItems.addAll(ActiveCluster.getInstance().get().bucket(selectedBucket).collections()
+                                                     .getAllScopes());
+
+                targetScopeCombo.removeAllItems();
+
+                String[] scopes = targetScopeItems.stream().map(ScopeSpec::name).distinct().toArray(String[]::new);
+                targetScopeCombo.setModel(new DefaultComboBoxModel<>(scopes));
+            }
+        });
+
+        JLabel scopeLabel = new JLabel("Scope");
+        gbc.gridx = 0;
+        gbc.gridy++;
+        gbc.weightx = 0.05;
+        targetPanel.add(scopeLabel, gbc);
+
+        targetScopeCombo = new ComboBox<>();
+        gbc.gridx = 1;
+        gbc.weightx = 0.95;
+        targetPanel.add(targetScopeCombo, gbc);
+
+        JButton back = new JButton("Back");
+        back.addActionListener(e -> {
+            cardLayout.show(cardPanel, "1");
+        });
+
+        JLabel errorLabel = new JLabel();
+        JPanel southErrorPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        southErrorPanel.add(errorLabel);
+
+        JButton importButton = new JButton("Import");
+        importButton.addActionListener(e -> {
+            importMongoDataset();
+        });
+
+        JPanel southButtonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        southButtonPanel.add(back);
+        southButtonPanel.add(importButton);
+
+        JPanel southPanel = new JPanel();
+        southPanel.setLayout(new BoxLayout(southPanel, BoxLayout.Y_AXIS));
+        southPanel.add(southErrorPanel);
+        southPanel.add(southButtonPanel);
+
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.add(targetPanel, BorderLayout.NORTH);
+        panel.add(southPanel, BorderLayout.SOUTH);
+
+        return panel;
+    }
+
+
+    @Override
+    protected Action @NotNull [] createActions() {
+        return new Action[0];
+    }
+
+    protected void importMongoDataset() {
+        try {
+            String targetBucket = (String) targetBucketCombo.getSelectedItem();
+            String targetScope = (String) targetScopeCombo.getSelectedItem();
+
+            String clusterURL = ActiveCluster.getInstance().getClusterURL();
+            String username = ActiveCluster.getInstance().getUsername();
+            String password = ActiveCluster.getInstance().getPassword();
+
+
+            List<String> selectedCols;
+            if (tablesCombobox.getSelectedItems().contains(ALL_TABLES_IN_THE_DATABASE)) {
+                if (awsProfileButton.isSelected()) {
+                    selectedCols = DynamoConnection.listTables(((AWSRegion) regionBox.getSelectedItem()).getCode(), profileBox
+                            .getSelectedItem().toString());
+                } else {
+                    selectedCols = DynamoConnection.listTables(((AWSRegion) regionBox.getSelectedItem()).getCode(), accessKeyField
+                            .getText().trim(), secretKeyField.getText().trim());
+                }
+            } else {
+                selectedCols = tablesCombobox.getSelectedItems();
+            }
+
+            List<CBMigrateDynamo.CBMigrateDynamoCommandBuilder> builders = new ArrayList<>();
+
+            for (String collection : selectedCols) {
+                CBMigrateDynamo.CBMigrateDynamoCommandBuilder builder = new CBMigrateDynamo.CBMigrateDynamoCommandBuilder();
+                if (awsProfileButton.isSelected()) {
+                    builder.setAwsProfile(profileBox.getSelectedItem().toString());
+                } else {
+                    builder.setAwsAccessKey(accessKeyField.getText().trim())
+                           .setAwsAccessKeySecret(secretKeyField.getText().trim());
+                }
+
+                builder.setDynamoTable(collection).setCBBucket(targetBucket).setCBScope(targetScope)
+                       .setAwsRegion(((AWSRegion) regionBox.getSelectedItem()).getCode()).setCBCollection(collection)
+                       .setCBCluster(clusterURL).setCBUsername(username)
+                       .setCopyIndexes(String.valueOf(migrateIdxCheckBox.isSelected())).setCBPassword(password)
+                       .setCBGenerateKey("#UUID#")
+                ;
+
+                if (verboseModeCheckbox.isSelected()) {
+                    builder.setVerbose();
+                }
+
+                if (sslNoVerifyCheckbox.isSelected()) {
+                    builder.setSslNoVerify();
+                }
+                builders.add(builder);
+            }
+
+            CBMigrateDynamo.migrateMultipleCollections(project, builders);
+            super.doOKAction();
+        } catch (Exception e) {
+            Log.error("Error migrating data: " + e.getMessage(), e);
+            ApplicationManager.getApplication()
+                              .invokeLater(() -> Messages.showErrorDialog(project, "Error migrating " + "data: " + e.getMessage(), "Error"));
+        }
+    }
+
+    @Override
+    protected void dispose() {
+        super.dispose();
+    }
+
+    static class AWSRegion {
+        private String name;
+        private String code;
+
+        public AWSRegion(String name, String code) {
+            this.name = name;
+            this.code = code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        @Override
+        public String toString() {
+            return name + " (" + code + ")";
+        }
+    }
+}
diff --git a/src/main/java/com/couchbase/intellij/tools/cbmigrate/MigrationDialog.java b/src/main/java/com/couchbase/intellij/tools/cbmigrate/MigrationDialog.java
index ff0f1509..909a5bd5 100644
--- a/src/main/java/com/couchbase/intellij/tools/cbmigrate/MigrationDialog.java
+++ b/src/main/java/com/couchbase/intellij/tools/cbmigrate/MigrationDialog.java
@@ -30,25 +30,18 @@
 public class MigrationDialog extends DialogWrapper {
 
     public static final String ALL_COLLECTIONS_IN_THE_DATABASE = "All collections in the database";
+    protected static final Color ERROR_COLOR = Color.decode("#FF4444");
+    protected static final Color SUCCESS_COLOR = Color.decode("#00C851");
+    protected static final Color ESTABILISHING_COLOR = Color.decode("#FFA726");
     private final Project project;
-
-    private JPanel cardPanel;
-    private CardLayout cardLayout;
-
     protected JBTextField mongoDBTextField;
-
     protected ComboBox<String> databaseComboBox;
     protected JComboCheckBox collectionsComboBox;
-
     protected ComboBox<String> targetBucketCombo;
     protected ComboBox<String> targetScopeCombo;
-
     protected List<ScopeSpec> targetScopeItems;
-
-    protected static final Color ERROR_COLOR = Color.decode("#FF4444");
-    protected static final Color SUCCESS_COLOR = Color.decode("#00C851");
-    protected static final Color ESTABILISHING_COLOR = Color.decode("#FFA726");
-
+    private JPanel cardPanel;
+    private CardLayout cardLayout;
     private MongoConnection mongoConnection;
 
     public MigrationDialog(Project project) {
@@ -227,7 +220,8 @@ private void showDataSourcePanel(List<String> databases) {
             if (databaseComboBox.getSelectedItem() == null) {
                 return;
             }
-            List<String> collectionNames = mongoConnection.getCollectionNames(databaseComboBox.getSelectedItem().toString());
+            List<String> collectionNames =
+                    mongoConnection.getCollectionNames(databaseComboBox.getSelectedItem().toString());
             collectionsComboBox.removeAllItems();
             collectionsComboBox.addItem(ALL_COLLECTIONS_IN_THE_DATABASE);
             for (String collectionName : collectionNames) {
@@ -426,13 +420,11 @@ public void mouseEntered(MouseEvent e) {
             String selectedBucket = (String) targetBucketCombo.getSelectedItem();
             if (selectedBucket != null) {
                 targetScopeItems = new ArrayList<>();
-                targetScopeItems.addAll(ActiveCluster.getInstance().get().bucket(selectedBucket)
-                        .collections().getAllScopes());
+                targetScopeItems.addAll(ActiveCluster.getInstance().get().bucket(selectedBucket).collections().getAllScopes());
 
                 targetScopeCombo.removeAllItems();
 
-                String[] scopes = targetScopeItems.stream()
-                        .map(ScopeSpec::name).distinct().toArray(String[]::new);
+                String[] scopes = targetScopeItems.stream().map(ScopeSpec::name).distinct().toArray(String[]::new);
                 targetScopeCombo.setModel(new DefaultComboBoxModel<>(scopes));
             }
         });
@@ -547,29 +539,20 @@ protected void importMongoDataset() {
                 selectedCols = collectionsComboBox.getSelectedItems();
             }
 
-            List<CBMigrate.CBMigrateCommandBuilder> builders = new ArrayList<>();
+            List<CBMigrateMongo.CBMigrateCommandBuilder> builders = new ArrayList<>();
 
             for (String collection : selectedCols) {
-                CBMigrate.CBMigrateCommandBuilder builder = new CBMigrate.CBMigrateCommandBuilder()
-                        .setMongoDBURI(mongoDBConnectionString)
-                        .setMongoDBDatabase(databaseName)
-                        .setMongoDBCollection(collection)
-                        .setCBBucket(targetBucket)
-                        .setCBScope(targetScope)
-                        .setCBCollection(collection)
-                        .setCBCluster(clusterURL)
-                        .setCBUsername(username)
-                        .setCBPassword(password)
-                        .setCBGenerateKey("%_id%");
+                CBMigrateMongo.CBMigrateCommandBuilder builder =
+                        new CBMigrateMongo.CBMigrateCommandBuilder().setMongoDBURI(mongoDBConnectionString).setMongoDBDatabase(databaseName).setMongoDBCollection(collection).setCBBucket(targetBucket).setCBScope(targetScope).setCBCollection(collection).setCBCluster(clusterURL).setCBUsername(username).setCBPassword(password).setCBGenerateKey("%_id%");
                 builders.add(builder);
             }
 
-            CBMigrate.migrateMultipleCollections(project, builders);
+            CBMigrateMongo.migrateMultipleCollections(project, builders);
             super.doOKAction();
         } catch (Exception e) {
             Log.error("Error migrating data: " + e.getMessage(), e);
-            ApplicationManager.getApplication().invokeLater(
-                    () -> Messages.showErrorDialog(project, "Error migrating data: " + e.getMessage(), "Error"));
+            ApplicationManager.getApplication().invokeLater(() -> Messages.showErrorDialog(project, "Error migrating " +
+                    "data: " + e.getMessage(), "Error"));
         }
     }
 
diff --git a/src/main/java/com/couchbase/intellij/tree/TreeRightClickListener.java b/src/main/java/com/couchbase/intellij/tree/TreeRightClickListener.java
index 2d288ee2..2eb92850 100644
--- a/src/main/java/com/couchbase/intellij/tree/TreeRightClickListener.java
+++ b/src/main/java/com/couchbase/intellij/tree/TreeRightClickListener.java
@@ -13,6 +13,7 @@
 import com.couchbase.intellij.tools.CBImport;
 import com.couchbase.intellij.tools.CBTools;
 import com.couchbase.intellij.tools.PillowFightDialog;
+import com.couchbase.intellij.tools.cbmigrate.DynamoMigrationDialog;
 import com.couchbase.intellij.tools.cbmigrate.MigrationDialog;
 import com.couchbase.intellij.tools.dialog.DDLExportDialog;
 import com.couchbase.intellij.tools.dialog.ExportDialog;
@@ -65,13 +66,15 @@ public class TreeRightClickListener {
 
     public static int searchWorkbenchCounter = 0;
 
-    public static void handle(Tree tree, Project project, JPanel toolbarPanel, MouseEvent e, DefaultMutableTreeNode clickedNode) {
+    public static void handle(Tree tree, Project project, JPanel toolbarPanel, MouseEvent e,
+                              DefaultMutableTreeNode clickedNode) {
         Object userObject = clickedNode.getUserObject();
         int row = tree.getClosestRowForLocation(e.getX(), e.getY());
         tree.setSelectionRow(row);
 
         if (userObject instanceof ConnectionNodeDescriptor) {
-            handleConnectionRightClick(project, toolbarPanel, e, clickedNode, (ConnectionNodeDescriptor) userObject, tree);
+            handleConnectionRightClick(project, toolbarPanel, e, clickedNode, (ConnectionNodeDescriptor) userObject,
+                    tree);
         } else if (userObject instanceof BucketNodeDescriptor) {
             handleBucketRightClick(project, e, clickedNode, tree);
         } else if (userObject instanceof ScopeNodeDescriptor) {
@@ -94,16 +97,14 @@ private static void handleSchemaDataNodeDescriptorClick(Project project, MouseEv
                                                             SchemaDataNodeDescriptor userObject, Tree tree) {
 
         DefaultActionGroup actionGroup = new DefaultActionGroup();
-        Map<String, String> map = RelationshipStorage.getInstance().getValue().getRelationships()
-                .get(ActiveCluster.getInstance().getId());
+        Map<String, String> map =
+                RelationshipStorage.getInstance().getValue().getRelationships().get(ActiveCluster.getInstance().getId());
 
         if (map != null && map.containsKey(userObject.getPath())) {
             AnAction clearRelationShip = new AnAction("Clear Relationship") {
                 @Override
                 public void actionPerformed(@NotNull AnActionEvent e) {
-                    RelationshipStorage.getInstance().getValue().getRelationships()
-                            .get(ActiveCluster.getInstance().getId())
-                            .remove(userObject.getPath());
+                    RelationshipStorage.getInstance().getValue().getRelationships().get(ActiveCluster.getInstance().getId()).remove(userObject.getPath());
 
                     userObject.setReference(null);
                     tree.revalidate();
@@ -125,7 +126,9 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         showPopup(e, tree, actionGroup);
     }
 
-    private static void handleConnectionRightClick(Project project, JPanel toolBarPanel, MouseEvent e, DefaultMutableTreeNode clickedNode, ConnectionNodeDescriptor userObject, Tree tree) {
+    private static void handleConnectionRightClick(Project project, JPanel toolBarPanel, MouseEvent e,
+                                                   DefaultMutableTreeNode clickedNode,
+                                                   ConnectionNodeDescriptor userObject, Tree tree) {
         DefaultActionGroup actionGroup = new DefaultActionGroup();
 
         if (userObject.isActive()) {
@@ -227,8 +230,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             }
 
             // Migration Dialog
-            if (!ActiveCluster.getInstance().isReadOnlyMode() && CBTools.getTool(CBTools.Type.CBMIGRATE).isAvailable()
-            ) {
+            if (!ActiveCluster.getInstance().isReadOnlyMode() && CBTools.getTool(CBTools.Type.CBMIGRATE).isAvailable()) {
                 AnAction cbMigration = new AnAction("MongoDB to Couchbase Migration") {
                     @Override
                     public void actionPerformed(@NotNull AnActionEvent e) {
@@ -236,7 +238,16 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                         dialog.show();
                     }
                 };
+
+                AnAction dynamo = new AnAction("DynamoDB to Couchbase Migration") {
+                    @Override
+                    public void actionPerformed(@NotNull AnActionEvent e) {
+                        DynamoMigrationDialog dialog = new DynamoMigrationDialog(project);
+                        dialog.show();
+                    }
+                };
                 tools.add(cbMigration);
+                tools.add(dynamo);
                 tools.addSeparator();
             }
 
@@ -267,7 +278,8 @@ public void closed(@Nullable Color color) {
                         }
                     };
 
-                    ColorPicker.showDialog(tree, "Choose a Color for This Connection", initialColor, true, List.of(colorPickerListener), true);
+                    ColorPicker.showDialog(tree, "Choose a Color for This Connection", initialColor, true,
+                            List.of(colorPickerListener), true);
                 }
             };
             colors.add(colorAction);
@@ -277,7 +289,7 @@ public void closed(@Nullable Color color) {
                     @Override
                     public void actionPerformed(@NotNull AnActionEvent e) {
                         ActiveCluster.getInstance().setReadOnlyMode(true);
-                        ApplicationManager.getApplication().invokeLater(() -> Messages.showWarningDialog("<html>The <strong>Read Only Mode</strong> is a simple guardrail in the plugin to avoid unwanted changes in sensible environments. Please note that this is a <strong>best effort</strong> approach. For true read-only approach, connect to the cluster using read-only credentials.</html>", "Couchbase Plugin Warning"));
+                        ApplicationManager.getApplication().invokeLater(() -> Messages.showWarningDialog("<html>The " + "<strong>Read Only Mode</strong> is a simple guardrail in the plugin to avoid " + "unwanted changes in sensible environments. Please note that this is a <strong>best " + "effort</strong> approach. For true read-only approach, connect to the cluster using " + "read-only credentials.</html>", "Couchbase Plugin Warning"));
 
                     }
                 };
@@ -351,7 +363,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         AnAction editConnection = new AnAction("Edit Connection") {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
-                NewConnectionDialog dialog = new NewConnectionDialog(project, tree, userObject.getSavedCluster(), clickedNode);
+                NewConnectionDialog dialog = new NewConnectionDialog(project, tree, userObject.getSavedCluster(),
+                        clickedNode);
                 dialog.show();
             }
         };
@@ -369,7 +382,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         showPopup(e, tree, actionGroup);
     }
 
-    private static void handleBucketRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode, Tree tree) {
+    private static void handleBucketRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode,
+                                               Tree tree) {
         DefaultActionGroup actionGroup = new DefaultActionGroup();
         AnAction menuItem = new AnAction("Refresh Scopes") {
             @Override
@@ -414,7 +428,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                         String bucketName = ((BucketNodeDescriptor) clickedNode.getUserObject()).getText();
 
                         // Show confirmation dialog before deleting bucket
-                        int result = Messages.showYesNoDialog("Are you sure you want to delete the bucket " + bucketName + "?", "Delete Bucket", Messages.getQuestionIcon());
+                        int result =
+                                Messages.showYesNoDialog("Are you sure you want to delete the bucket " + bucketName + "?", "Delete Bucket", Messages.getQuestionIcon());
                         if (result != Messages.YES) {
                             return;
                         }
@@ -428,7 +443,9 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                         tree.collapsePath(treePath.getParentPath());
                         tree.expandPath(treePath.getParentPath());
                     } catch (Exception ex) {
-                        ApplicationManager.getApplication().invokeLater(() -> Messages.showInfoMessage("An error occurred while creating the bucket. Check the Log tab for more.", "Couchbase Plugin Error"));
+                        ApplicationManager.getApplication().invokeLater(() -> Messages.showInfoMessage("An error " +
+                                "occurred while creating the bucket. Check the Log tab for more.", "Couchbase Plugin "
+                                + "Error"));
                         Log.error("Bucket deletion failed ", ex);
                     }
                 }
@@ -439,7 +456,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         showPopup(e, tree, actionGroup);
     }
 
-    private static void handleScopeRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode, Tree tree) {
+    private static void handleScopeRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode,
+                                              Tree tree) {
         DefaultActionGroup actionGroup = new DefaultActionGroup();
         ScopeNodeDescriptor scope = (ScopeNodeDescriptor) clickedNode.getUserObject();
         String bucketName = scope.getBucket();
@@ -461,7 +479,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                 @Override
                 public void actionPerformed(@NotNull AnActionEvent e) {
 
-                    NewCollectionDialog dialog = new NewCollectionDialog(project, bucketName, scopeName, clickedNode, tree);
+                    NewCollectionDialog dialog = new NewCollectionDialog(project, bucketName, scopeName, clickedNode,
+                            tree);
                     dialog.show();
                 }
             };
@@ -477,7 +496,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                         try {
 
                             // Show confirmation dialog before deleting scope
-                            int result = Messages.showYesNoDialog("Are you sure you want to delete the scope " + scopeName + "?", "Delete Scope", Messages.getQuestionIcon());
+                            int result =
+                                    Messages.showYesNoDialog("Are you sure you want to delete the scope " + scopeName + "?", "Delete Scope", Messages.getQuestionIcon());
                             if (result != Messages.YES) {
                                 return;
                             }
@@ -510,7 +530,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                     if (file != null) {
                         CBImport.simpleScopeImport(scope.getBucket(), scope.getText(), file.getPath(), project);
                     } else {
-                        Messages.showErrorDialog("Simple Import requires a .json file. Please try again.", "Simple Import Error");
+                        Messages.showErrorDialog("Simple Import requires a .json file. Please try again.",
+                                "Simple " + "Import Error");
                     }
                 }
             };
@@ -520,8 +541,10 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         AnAction simpleExport = new AnAction("Simple Export") {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
-                FileSaverDescriptor fsd = new FileSaverDescriptor("Simple Scope Export", "Choose where you want to save the file:");
-                VirtualFileWrapper wrapper = FileChooserFactory.getInstance().createSaveFileDialog(fsd, project).save(("cb_export-" + scope.getText() + "-" + TimeUtils.getCurrentDateTime() + ".json"));
+                FileSaverDescriptor fsd = new FileSaverDescriptor("Simple Scope Export",
+                        "Choose where you want to " + "save the file:");
+                VirtualFileWrapper wrapper =
+                        FileChooserFactory.getInstance().createSaveFileDialog(fsd, project).save(("cb_export-" + scope.getText() + "-" + TimeUtils.getCurrentDateTime() + ".json"));
                 if (wrapper != null) {
                     File file = wrapper.getFile();
                     CBExport.simpleScopeExport(scope.getBucket(), scope.getText(), file.getAbsolutePath());
@@ -540,8 +563,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                         MermaidERDiagramDialog dialog = new MermaidERDiagramDialog(bucketName, scopeName);
                         dialog.show();
                     } catch (Exception ex) {
-                        Log.error("Failed to load the ER Diagram. Double check if the JRE that you are running your IDE has support for JCEF." +
-                                " https://plugins.jetbrains.com/docs/intellij/jcef.html#enabling-jcef", ex);
+                        Log.error("Failed to load the ER Diagram. Double check if the JRE that you are running your " + "IDE has support for JCEF." + " https://plugins.jetbrains.com/docs/intellij/jcef" + ".html#enabling-jcef", ex);
 
                     }
                 }
@@ -553,7 +575,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         showPopup(e, tree, actionGroup);
     }
 
-    private static void handleDocumentRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode, FileNodeDescriptor col, Tree tree) {
+    private static void handleDocumentRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode,
+                                                 FileNodeDescriptor col, Tree tree) {
         DefaultActionGroup actionGroup = new DefaultActionGroup();
 
         String bucket = col.getBucket();
@@ -576,7 +599,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                     }
                 }
                 if (metadata != null) {
-                    VirtualFile virtualFile = new LightVirtualFile("(read-only) " + docId + "_meta.json", FileTypeManager.getInstance().getFileTypeByExtension("json"), metadata);
+                    VirtualFile virtualFile = new LightVirtualFile("(read-only) " + docId + "_meta.json",
+                            FileTypeManager.getInstance().getFileTypeByExtension("json"), metadata);
                     DocumentFormatter.formatFile(project, virtualFile);
                     FileEditorManager fileEditorManager = FileEditorManager.getInstance(project);
                     fileEditorManager.openFile(virtualFile, true);
@@ -591,7 +615,9 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             AnAction deleteDoc = new AnAction("Delete Document") {
                 @Override
                 public void actionPerformed(@NotNull AnActionEvent e) {
-                    int result = Messages.showYesNoDialog("<html>Are you sure you want to delete the document <strong>" + col.getId() + "</strong>?</html>", "Delete Document", Messages.getQuestionIcon());
+                    int result = Messages.showYesNoDialog("<html>Are you sure you want to delete the document " +
+                            "<strong>" + col.getId() + "</strong>?</html>", "Delete Document",
+                            Messages.getQuestionIcon());
                     if (result != Messages.YES) {
                         return;
                     }
@@ -617,7 +643,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                     } catch (Exception ex) {
                         ex.printStackTrace();
                         Log.error("An error occurred while trying to delete the document " + col.getId(), ex);
-                        Messages.showErrorDialog("Could not delete the document. Please check the logs for more.", "Couchbase Plugin Error");
+                        Messages.showErrorDialog("Could not delete the document. Please check the logs for more.",
+                                "Couchbase Plugin Error");
                     }
 
                 }
@@ -628,13 +655,15 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         showPopup(e, tree, actionGroup);
     }
 
-    private static void handleIndexRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode, IndexNodeDescriptor idx, Tree tree) {
+    private static void handleIndexRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode,
+                                              IndexNodeDescriptor idx, Tree tree) {
         DefaultActionGroup actionGroup = new DefaultActionGroup();
 
         AnAction viewIdxStatsAction = new AnAction("View Stats") {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
-                IndexOverviewDialog dialog = new IndexOverviewDialog(project, idx.getBucket(), idx.getScope(), idx.getCollection(), idx.getText().substring(0, idx.getText().lastIndexOf('.')));
+                IndexOverviewDialog dialog = new IndexOverviewDialog(project, idx.getBucket(), idx.getScope(),
+                        idx.getCollection(), idx.getText().substring(0, idx.getText().lastIndexOf('.')));
                 dialog.show();
             }
         };
@@ -645,17 +674,20 @@ public void actionPerformed(@NotNull AnActionEvent e) {
 
     private static void showPopup(MouseEvent e, Tree tree, DefaultActionGroup actionGroup) {
         DataContext dataContext = DataManager.getInstance().getDataContext(tree);
-        JBPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(null, actionGroup, dataContext, JBPopupFactory.ActionSelectionAid.MNEMONICS, false);
+        JBPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(null, actionGroup, dataContext,
+                JBPopupFactory.ActionSelectionAid.MNEMONICS, false);
         popup.show(new RelativePoint(e));
     }
 
-    private static void handleCollectionRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode, CollectionNodeDescriptor col, Tree tree) {
+    private static void handleCollectionRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode,
+                                                   CollectionNodeDescriptor col, Tree tree) {
         DefaultActionGroup actionGroup = new DefaultActionGroup();
 
         AnAction openDocument = new AnAction("Open Document") {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
-                OpenDocumentDialog dialog = new OpenDocumentDialog(false, project, tree, col.getBucket(), col.getScope(), col.getText());
+                OpenDocumentDialog dialog = new OpenDocumentDialog(false, project, tree, col.getBucket(),
+                        col.getScope(), col.getText());
                 dialog.show();
             }
         };
@@ -665,7 +697,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             AnAction createDocument = new AnAction("Create Document") {
                 @Override
                 public void actionPerformed(@NotNull AnActionEvent e) {
-                    OpenDocumentDialog dialog = new OpenDocumentDialog(true, project, tree, col.getBucket(), col.getScope(), col.getText());
+                    OpenDocumentDialog dialog = new OpenDocumentDialog(true, project, tree, col.getBucket(),
+                            col.getScope(), col.getText());
                     dialog.show();
                 }
             };
@@ -683,11 +716,12 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
 
-                CollectionNodeDescriptor desc = new CollectionNodeDescriptor(
-                        col.getText(), null, col.getBucket(), col.getScope(), null);
+                CollectionNodeDescriptor desc = new CollectionNodeDescriptor(col.getText(), null, col.getBucket(),
+                        col.getScope(), null);
                 String field = DataLoader.getIndexedField(desc);
 
-                DocumentFilterDialog dialog = new DocumentFilterDialog(tree, clickedNode, col.getBucket(), col.getScope(), col.getText(), field != null);
+                DocumentFilterDialog dialog = new DocumentFilterDialog(tree, clickedNode, col.getBucket(),
+                        col.getScope(), col.getText(), field != null);
                 dialog.show();
             }
         };
@@ -714,7 +748,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         AnAction refreshDocuments = new AnAction("Refresh Documents") {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
-                InferHelper.invalidateInferCacheIfOlder(col.getBucket(), col.getScope(), col.getText(), TimeUnit.MINUTES.toMillis(1));
+                InferHelper.invalidateInferCacheIfOlder(col.getBucket(), col.getScope(), col.getText(),
+                        TimeUnit.MINUTES.toMillis(1));
                 DataLoader.listDocuments(clickedNode, tree, 0);
             }
         };
@@ -730,7 +765,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                     public void actionPerformed(@NotNull AnActionEvent e) {
                         try {
 
-                            int result = Messages.showYesNoDialog("Are you sure you want to delete the collection " + col.getText() + "?", "Delete Collection", Messages.getQuestionIcon());
+                            int result =
+                                    Messages.showYesNoDialog("Are you sure you want to delete the collection " + col.getText() + "?", "Delete Collection", Messages.getQuestionIcon());
                             if (result != Messages.YES) {
                                 return;
                             }
@@ -759,12 +795,15 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                 AnAction simpleImport = new AnAction("Simple Import") {
                     @Override
                     public void actionPerformed(@NotNull AnActionEvent e) {
-                        FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFileDescriptor("json");
+                        FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFileDescriptor(
+                                "json");
                         VirtualFile file = FileChooser.chooseFile(descriptor, project, null);
                         if (file != null) {
-                            CBImport.simpleCollectionImport(col.getBucket(), col.getScope(), col.getText(), file.getPath(), null);
+                            CBImport.simpleCollectionImport(col.getBucket(), col.getScope(), col.getText(),
+                                    file.getPath(), null);
                         } else {
-                            Messages.showErrorDialog("Simple Import requires a .json file. Please try again.", "Simple Import Error");
+                            Messages.showErrorDialog("Simple Import requires a .json file. Please try again.",
+                                    "Simple Import Error");
                         }
                     }
                 };
@@ -774,11 +813,14 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             AnAction simpleExport = new AnAction("Simple Export") {
                 @Override
                 public void actionPerformed(@NotNull AnActionEvent e) {
-                    FileSaverDescriptor fsd = new FileSaverDescriptor("Simple Collection Export", "Choose where you want to save the file:");
-                    VirtualFileWrapper wrapper = FileChooserFactory.getInstance().createSaveFileDialog(fsd, project).save(("cb_export-" + col.getScope() + "_" + col.getText() + "-" + TimeUtils.getCurrentDateTime() + ".json"));
+                    FileSaverDescriptor fsd = new FileSaverDescriptor("Simple Collection Export",
+                            "Choose where you " + "want to save the file:");
+                    VirtualFileWrapper wrapper =
+                            FileChooserFactory.getInstance().createSaveFileDialog(fsd, project).save(("cb_export-" + col.getScope() + "_" + col.getText() + "-" + TimeUtils.getCurrentDateTime() + ".json"));
                     if (wrapper != null) {
                         File file = wrapper.getFile();
-                        CBExport.simpleCollectionExport(col.getBucket(), col.getScope(), col.getText(), file.getAbsolutePath(), null);
+                        CBExport.simpleCollectionExport(col.getBucket(), col.getScope(), col.getText(),
+                                file.getAbsolutePath(), null);
                     }
                 }
             };
@@ -789,7 +831,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
     }
 
 
-    private static void handleSearchIndexRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode, SearchIndexNodeDescriptor idx, Tree tree) {
+    private static void handleSearchIndexRightClick(Project project, MouseEvent e, DefaultMutableTreeNode clickedNode
+            , SearchIndexNodeDescriptor idx, Tree tree) {
         DefaultActionGroup actionGroup = new DefaultActionGroup();
 
 
@@ -809,7 +852,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                                   "fields": ["*"]
                                 }
                                         """;
-                        VirtualFile virtualFile = new LightVirtualFile(fileName, FileTypeManager.getInstance().getFileTypeByExtension("cbs.json"), fileContent);
+                        VirtualFile virtualFile = new LightVirtualFile(fileName,
+                                FileTypeManager.getInstance().getFileTypeByExtension("cbs.json"), fileContent);
                         virtualFile.putUserData(VirtualFileKeys.BUCKET, idx.getBucket());
                         virtualFile.putUserData(VirtualFileKeys.SEARCH_INDEX, idx.getIndexName());
                         FileEditorManager fileEditorManager = FileEditorManager.getInstance(project);
@@ -828,7 +872,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             AnAction deleteDoc = new AnAction("Delete Index") {
                 @Override
                 public void actionPerformed(@NotNull AnActionEvent e) {
-                    int result = Messages.showYesNoDialog("<html>Are you sure you want to delete the index <strong>" + idx.getIndexName() + "</strong>?</html>", "Delete Document", Messages.getQuestionIcon());
+                    int result =
+                            Messages.showYesNoDialog("<html>Are you sure you want to delete the index <strong>" + idx.getIndexName() + "</strong>?</html>", "Delete Document", Messages.getQuestionIcon());
                     if (result != Messages.YES) {
                         return;
                     }
@@ -855,7 +900,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                     } catch (Exception ex) {
                         ex.printStackTrace();
                         Log.error("An error occurred while trying to delete the index " + idx.getIndexName(), ex);
-                        Messages.showErrorDialog("Could not delete the index. Please check the logs for more.", "Couchbase Plugin Error");
+                        Messages.showErrorDialog("Could not delete the index. Please check the logs for more.",
+                                "Couchbase Plugin Error");
                     }
 
                 }
diff --git a/src/main/java/com/couchbase/intellij/tree/docfilter/DocumentFilterDialog.java b/src/main/java/com/couchbase/intellij/tree/docfilter/DocumentFilterDialog.java
index 85a1972e..ead69c87 100644
--- a/src/main/java/com/couchbase/intellij/tree/docfilter/DocumentFilterDialog.java
+++ b/src/main/java/com/couchbase/intellij/tree/docfilter/DocumentFilterDialog.java
@@ -3,7 +3,6 @@
 import com.couchbase.client.core.error.CouchbaseException;
 import com.couchbase.intellij.database.ActiveCluster;
 import com.couchbase.intellij.persistence.QueryFilter;
-import com.couchbase.intellij.persistence.storage.QueryFiltersStorage;
 import com.couchbase.intellij.tree.node.CollectionNodeDescriptor;
 import com.couchbase.intellij.tree.overview.apis.CouchbaseRestAPI;
 import com.couchbase.intellij.workbench.SQLPPQueryUtils;
@@ -15,7 +14,6 @@
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.components.JBScrollPane;
-import com.intellij.ui.components.JBTabbedPane;
 import com.intellij.ui.components.JBTextField;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.ui.JBUI;
@@ -25,7 +23,6 @@
 import utils.TemplateUtil;
 
 import javax.swing.*;
-import javax.swing.border.EmptyBorder;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.*;
@@ -40,19 +37,16 @@ public class DocumentFilterDialog extends DialogWrapper {
     private final String scope;
     private final Tree tree;
     private final DefaultMutableTreeNode clickedNode;
+    private final boolean hasIndex;
     private EditorEx editor;
     private JLabel resultsLabel;
     private JLabel errorLabel;
-
     private JBTextField startingDocumentIdField;
     private JBTextField endingDocumentIdField;
     private JSpinner offsetField;
-
     private JRadioButton queryRadioButton;
     private JRadioButton keyValueRadioButton;
-
     private QueryFilter queryFilter;
-    private final boolean hasIndex;
 
     public DocumentFilterDialog(Tree tree, DefaultMutableTreeNode clickedNode, String bucket, String scope, String collectionName, boolean hasIndex) {
         super(false);
@@ -118,10 +112,7 @@ protected JComponent createCenterPanel() {
         infoLabel.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseEntered(MouseEvent e) {
-                String content = "<html><div style='margin: 10 10 10 10'>Complete the query with filters you would like to apply: <br>" +
-                        "<strong>Ex:</strong> country = <span style='color:" + fontStringColor + "'>'United States'</span><br>" +
-                        "<ul> <li>If you don't provide an <span style='color:" + fontKeywordColor + "'>ORDER BY</span>, the documents will be sorted by the document's id.</li>" +
-                        "<li>Your filter should not include a <span style='color:" + fontKeywordColor + "'>LIMIT</span> or <span style='color:" + fontKeywordColor + "'>OFFSET</span></div></html>";
+                String content = "<html><div style='margin: 10 10 10 10'>Complete the query with filters you would like to apply: <br>" + "<strong>Ex:</strong> country = <span style='color:" + fontStringColor + "'>'United States'</span><br>" + "<ul> <li>If you don't provide an <span style='color:" + fontKeywordColor + "'>ORDER BY</span>, the documents will be sorted by the document's id.</li>" + "<li>Your filter should not include a <span style='color:" + fontKeywordColor + "'>LIMIT</span> or <span style='color:" + fontKeywordColor + "'>OFFSET</span></div></html>";
                 TemplateUtil.showGotItTooltip(e.getComponent(), content);
             }
         });
@@ -130,9 +121,8 @@ public void mouseEntered(MouseEvent e) {
         queryPanel.add(infoPanel, BorderLayout.NORTH);
 
         JPanel labelPanel = new JPanel(new BorderLayout());
-        JLabel label = new JLabel("<html><pre><strong style=\"color:" + fontKeywordColor + ";\">SELECT</strong>" +
-                " meta().id <strong style=\"color:" + fontKeywordColor + "\">FROM</strong> `" + collectionName + "` <strong style=color:\""
-                + fontKeywordColor + "\">WHERE</strong></pre></html>");
+        JLabel label = new JLabel(
+                "<html><pre><strong style=\"color:" + fontKeywordColor + ";\">SELECT</strong>" + " meta().id <strong style=\"color:" + fontKeywordColor + "\">FROM</strong> `" + collectionName + "` <strong style=color:\"" + fontKeywordColor + "\">WHERE</strong></pre></html>");
         label.setBorder(JBUI.Borders.emptyLeft(45));
         label.setVerticalAlignment(JLabel.TOP);
         labelPanel.add(label, BorderLayout.CENTER);
@@ -149,12 +139,15 @@ public void mouseEntered(MouseEvent e) {
 
         startingDocumentIdField = new JBTextField(20);
         endingDocumentIdField = new JBTextField(20);
-        offsetField = new JSpinner(new SpinnerNumberModel(queryFilter == null ? 0 : queryFilter.getOffset(), 0, 2147483648L, 1));
+        offsetField = new JSpinner(
+                new SpinnerNumberModel(queryFilter == null ? 0 : queryFilter.getOffset(), 0, 2147483648L, 1));
 
 
         if (queryFilter != null) {
-            startingDocumentIdField.setText(queryFilter.getDocumentStartKey() != null ? queryFilter.getDocumentStartKey() : "");
-            endingDocumentIdField.setText(queryFilter.getDocumentEndKey() != null ? queryFilter.getDocumentEndKey() : "");
+            startingDocumentIdField.setText(
+                    queryFilter.getDocumentStartKey() != null ? queryFilter.getDocumentStartKey() : "");
+            endingDocumentIdField.setText(
+                    queryFilter.getDocumentEndKey() != null ? queryFilter.getDocumentEndKey() : "");
             offsetField.setValue(Double.valueOf(queryFilter.getOffset()));
         }
 
@@ -270,9 +263,14 @@ protected JComponent createSouthPanel() {
                         return;
                     }
 
-                    results = CouchbaseRestAPI.listKVDocuments(bucket, scope, collectionName, ((Double) offsetField.getValue()).intValue(), 10,
-                            "".equals(startingDocumentIdField.getText().trim()) ? null : startingDocumentIdField.getText().trim(),
-                            "".equals(endingDocumentIdField.getText().trim()) ? null : endingDocumentIdField.getText().trim()).size();
+                    results = CouchbaseRestAPI.listKVDocuments(bucket, scope, collectionName,
+                                                               ((Double) offsetField.getValue()).intValue(), 10,
+                                                               "".equals(startingDocumentIdField.getText()
+                                                                                                .trim()) ? null : startingDocumentIdField
+                                                                       .getText().trim(), "".equals(
+                                                              endingDocumentIdField.getText().trim()) ? null : endingDocumentIdField.getText()
+                                                                                                                                    .trim())
+                                              .size();
                 } else {
                     if (!validateFilterKeywords(filter)) {
                         resultsLabel.setText("");
@@ -314,9 +312,13 @@ protected JComponent createSouthPanel() {
                         return;
                     }
 
-                    CouchbaseRestAPI.listKVDocuments(bucket, scope, collectionName, ((Double) offsetField.getValue()).intValue(), 10,
-                            "".equals(startingDocumentIdField.getText().trim()) ? null : startingDocumentIdField.getText().trim(),
-                            "".equals(endingDocumentIdField.getText().trim()) ? null : endingDocumentIdField.getText().trim()).size();
+                    CouchbaseRestAPI.listKVDocuments(bucket, scope, collectionName,
+                                                     ((Double) offsetField.getValue()).intValue(), 10, "".equals(
+                                    startingDocumentIdField.getText().trim()) ? null : startingDocumentIdField.getText()
+                                                                                                              .trim(),
+                                                     "".equals(endingDocumentIdField.getText()
+                                                                                    .trim()) ? null : endingDocumentIdField
+                                                             .getText().trim()).size();
                 } else {
                     String filter = editor.getDocument().getText();
                     if (!validateFilterKeywords(filter)) {
@@ -347,8 +349,12 @@ protected JComponent createSouthPanel() {
 
             if (keyValueRadioButton.isSelected()) {
                 queryFilter.setQuery(null);
-                queryFilter.setDocumentStartKey(startingDocumentIdField.getText().trim().isEmpty() ? null : startingDocumentIdField.getText().trim());
-                queryFilter.setDocumentEndKey(endingDocumentIdField.getText().trim().isEmpty() ? null : endingDocumentIdField.getText().trim());
+                queryFilter.setDocumentStartKey(
+                        startingDocumentIdField.getText().trim().isEmpty() ? null : startingDocumentIdField.getText()
+                                                                                                           .trim());
+                queryFilter.setDocumentEndKey(
+                        endingDocumentIdField.getText().trim().isEmpty() ? null : endingDocumentIdField.getText()
+                                                                                                       .trim());
                 queryFilter.setOffset(((Double) offsetField.getValue()).intValue());
             } else {
                 queryFilter.setQuery(editor.getDocument().getText());
@@ -414,25 +420,24 @@ private boolean validateFilterKeywords(String filter) {
     }
 
     private boolean validateKVFilters() {
-        if (endingDocumentIdField.getText().trim().isEmpty()
-                && startingDocumentIdField.getText().trim().isEmpty()
-                && ((Double) offsetField.getValue()).intValue() == 0) {
+        if (endingDocumentIdField.getText().trim().isEmpty() && startingDocumentIdField.getText().trim()
+                                                                                       .isEmpty() && ((Double) offsetField.getValue()).intValue() == 0) {
             errorLabel.setText("You must specify at least one filtering value");
             return false;
         }
+
+        if (((Double) offsetField.getValue()).intValue() > 1000) {
+            errorLabel.setText("The offset should be less than 1000");
+            return false;
+        }
         return true;
     }
 
     private int validateQueryFilters(String bucket, String scope, String collectionName, String filter) {
 
-        String query = "SELECT * FROM `" + collectionName + "` WHERE "
-                + filter
-                + (SQLPPQueryUtils.hasOrderBy(filter) ? "" : " ORDER BY meta().id")
-                + " LIMIT 10 OFFSET 0";
-        return ActiveCluster.getInstance().get()
-                .bucket(bucket)
-                .scope(scope)
-                .query(query).rowsAsObject().size();
+        String query = "SELECT * FROM `" + collectionName + "` WHERE " + filter + (SQLPPQueryUtils.hasOrderBy(
+                filter) ? "" : " ORDER BY meta().id") + " LIMIT 10 OFFSET 0";
+        return ActiveCluster.getInstance().get().bucket(bucket).scope(scope).query(query).rowsAsObject().size();
     }
 
 }
diff --git a/src/main/java/com/couchbase/intellij/workbench/FavoriteQueryDialog.java b/src/main/java/com/couchbase/intellij/workbench/FavoriteQueryDialog.java
index 71eabcda..03836f21 100644
--- a/src/main/java/com/couchbase/intellij/workbench/FavoriteQueryDialog.java
+++ b/src/main/java/com/couchbase/intellij/workbench/FavoriteQueryDialog.java
@@ -40,6 +40,7 @@ public class FavoriteQueryDialog extends DialogWrapper {
     private final EditorEx editor;
     private final EditorEx editorBuiltIn;
     private final Document document;
+    private JTabbedPane tabbedPane;
 
     private JEditorPane queryDesc;
 
@@ -58,11 +59,13 @@ protected FavoriteQueryDialog(Project project, Document document) {
         editorSettings.setIndentGuidesShown(false);
 
         final Document builtinDoc = EditorFactory.getInstance().createDocument("");
-        editorBuiltIn = (EditorEx) EditorFactory.getInstance().createEditor(builtinDoc, null, SQLPPFileType.INSTANCE, false);
+        editorBuiltIn = (EditorEx) EditorFactory.getInstance().createEditor(builtinDoc, null, SQLPPFileType.INSTANCE,
+                false);
 
         list.setCellRenderer(new DefaultListCellRenderer() {
             @Override
-            public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+            public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected,
+                                                          boolean cellHasFocus) {
                 super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
                 setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 5)); // Set left padding
                 return this;
@@ -83,7 +86,8 @@ public void actionPerformed(ActionEvent e) {
                                 listModel.remove(index);
                             }
                             List<FavoriteQuery> favList = FavoriteQueryStorage.getInstance().getValue().getList();
-                            favList = favList.stream().filter(f -> !f.getName().equals(value)).collect(Collectors.toList());
+                            favList =
+                                    favList.stream().filter(f -> !f.getName().equals(value)).collect(Collectors.toList());
                             FavoriteQueryStorage.getInstance().getValue().setList(favList);
                             ApplicationManager.getApplication().runWriteAction(() -> editor.getDocument().setText(""));
                         }
@@ -113,7 +117,9 @@ public void actionPerformed(ActionEvent e) {
         FavoriteQueryStorage.getInstance().getValue().getList().forEach(e -> addItem(e.getName()));
 
         try {
-            InputStream inputStream = FavoriteQueryDialog.class.getClassLoader().getResourceAsStream("builtinQueries/defaultFavoriteQueries.json");
+            InputStream inputStream =
+                    FavoriteQueryDialog.class.getClassLoader().getResourceAsStream("builtinQueries" +
+                            "/defaultFavoriteQueries.json");
             ObjectMapper objectMapper = new ObjectMapper();
             queries = objectMapper.readValue(inputStream, new TypeReference<List<BuiltinQuery>>() {
             });
@@ -135,7 +141,8 @@ public void actionPerformed(ActionEvent e) {
 
             builtinList.setCellRenderer(new DefaultListCellRenderer() {
                 @Override
-                public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                public Component getListCellRendererComponent(JList<?> list, Object value, int index,
+                                                              boolean isSelected, boolean cellHasFocus) {
                     super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
                     setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 5));
                     return this;
@@ -159,7 +166,7 @@ public void addItem(String item) {
     @Override
     protected JComponent createCenterPanel() {
 
-        JTabbedPane tabbedPane = new JTabbedPane();
+        tabbedPane = new JTabbedPane();
 
         JPanel yourQueriesPanel = new JPanel(new BorderLayout());
         yourQueriesPanel.add(scrollPane, BorderLayout.WEST);
@@ -170,7 +177,8 @@ protected JComponent createCenterPanel() {
         HyperlinkLabel hyperlinkLabel = new HyperlinkLabel("Help us to expand this list");
         hyperlinkLabel.addHyperlinkListener(e -> {
             try {
-                Desktop.getDesktop().browse(new URI("https://github.com/couchbaselabs/couchbase_jetbrains_plugin/issues"));
+                Desktop.getDesktop().browse(new URI("https://github.com/couchbaselabs/couchbase_jetbrains_plugin" +
+                        "/issues"));
             } catch (Exception ex) {
                 Log.error(ex);
             }
@@ -213,9 +221,17 @@ protected JComponent createCenterPanel() {
             @Override
             protected void doAction(ActionEvent e) {
                 ApplicationManager.getApplication().runWriteAction(() -> {
-                    if (!editor.getDocument().getText().isEmpty()) {
-                        document.setText(editor.getDocument().getText());
-                        close(0);
+
+                    if (tabbedPane.getSelectedIndex() == 1) {
+                        if (!editorBuiltIn.getDocument().getText().isEmpty()) {
+                            document.setText(editorBuiltIn.getDocument().getText());
+                            close(0);
+                        }
+                    } else {
+                        if (!editor.getDocument().getText().isEmpty()) {
+                            document.setText(editor.getDocument().getText());
+                            close(0);
+                        }
                     }
                 });
             }