diff --git a/src/actionModifiers/ImportExportWithDatasets/DatasetCollection.js b/src/actionModifiers/ImportExportWithDatasets/DatasetCollection.js
deleted file mode 100644
index bd8132c..0000000
--- a/src/actionModifiers/ImportExportWithDatasets/DatasetCollection.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import { dynamicPromiseAll } from "../../utils/promises";
-
-class DatasetCollection {
-    #datasets;
-    #visited;
-    #domainObject;
-    #openmct;
-    #visitedPromises;
-
-    constructor(openmct, domainObject) {
-        this.#datasets = new Set();
-        this.#visited = new Set();
-        this.#visitedPromises = [];
-
-        this.#openmct = openmct;
-        this.#domainObject = domainObject;
-    }
-
-    async getReferencedDatasets() {
-        this.#collectDatasetsFromTree(this.#domainObject);
-
-        await dynamicPromiseAll(this.#visitedPromises);
-
-        const datasetsPromises = Array.from(this.#datasets)
-            .map(datasetKeyString => {
-                return this.#openmct.objects.get(datasetKeyString)
-                    .then(object => {
-                        return {
-                            identifier: object.identifier,
-                            name: object.name
-                        }
-                    });
-            });
-
-        const datasets = await Promise.all(datasetsPromises);
-
-        return datasets;
-    }
-
-    async #collectDatasetsFromTree(node) {
-        let visited;
-        const visitedPromise = new Promise((resolve, reject) => {
-            visited = resolve;
-        });
-        this.#visitedPromises.push(visitedPromise);
-        
-        if (this.#hasVisited(node)) {
-            visited();
-            return;
-        }
-
-        this.#visited.add(
-            this.#getId(node)
-        );
-
-        if (this.#referencesDataset(node)) {
-            const datasetId = this.#getReferencedDatasetId(node);
-
-            this.#datasets.add(datasetId);
-        } else {
-            const compositionCollection = this.#openmct.composition.get(node);
-
-            if (compositionCollection !== undefined) {
-                const composition = await compositionCollection.load();
-                composition.forEach(this.#collectDatasetsFromTree.bind(this));
-            }
-        }
-
-        visited();
-    }
-
-    #hasVisited(node) {
-        const id = this.#openmct.objects.makeKeyString(node.identifier);
-
-        return this.#visited[id];
-    }
-
-    #referencesDataset(domainObject) {
-        return domainObject.identifier.namespace === 'vista';
-    }
-
-    #getReferencedDatasetId(domainObject) {
-        const location = domainObject.location;
-        const locationParts = location.split(':');
-        const datasetNamespace = locationParts[locationParts.length - 2];
-        const datasetKey = locationParts[locationParts.length - 1];
-
-        const datasetKeyString = `${datasetNamespace}:${datasetKey}`;
-
-        return datasetKeyString;
-    }
-
-    #getId(domainObject) {
-        return this.#openmct.objects.makeKeyString(domainObject.identifier);
-    }
-}
-
-async function collectReferencedDatasets(openmct, domainObject) {
-    const datasetCollection = new DatasetCollection(openmct, domainObject);
-    const datasets = await datasetCollection.getReferencedDatasets();
-
-    return datasets;
-}
-
-export {
-    collectReferencedDatasets
-};
diff --git a/src/actionModifiers/ImportExportWithDatasets/ImportWithDatasetsFormComponent.vue b/src/actionModifiers/ImportExportWithDatasets/ImportWithDatasetsFormComponent.vue
index e790717..2edc693 100644
--- a/src/actionModifiers/ImportExportWithDatasets/ImportWithDatasetsFormComponent.vue
+++ b/src/actionModifiers/ImportExportWithDatasets/ImportWithDatasetsFormComponent.vue
@@ -8,7 +8,12 @@
         <div
             v-if="!hasReferencedDatasets"
         >
-            {{ noReferencedDatasetsText }}
+            {{ noDatasetMappingRequiredText }}
+        </div>
+        <div
+            v-else-if="hasOneToOneMapping"
+        >
+            {{ noDatasetMappingRequiredText }}
         </div>
         <div
             v-else-if="hasReferencedDatasets && !hasDatasets"
@@ -30,7 +35,7 @@
                     class="c-form__row"
                 >
                     <span class="req-indicator req"></span>
-                    <label>{{ referencedDataset.name }}</label>
+                    <label>{{ getDatasetName(referencedDataset) }}</label>
                     <select
                         v-model="mapping[makeKeyString(referencedDataset)]"
                         @change="onChange"
@@ -74,7 +79,7 @@ export default {
         }
     },
     computed: {
-        noReferencedDatasetsText() {
+        noDatasetMappingRequiredText() {
             return 'All set. The import does not need dataset mapping.';
         },
         noDatasetsText() {
@@ -91,12 +96,19 @@ export default {
         },
         datasetOptions() {
             return this.datasets.map(dataset => {
+                const keyString = this.makeKeyString(dataset);
+                const name = this.getDatasetName(dataset);
+
                 return {
-                    name: dataset.name,
-                    value: this.openmct.objects.makeKeyString(dataset.identifier)
+                    name: name,
+                    value: keyString
                 };
             });
-        }
+        },
+        hasOneToOneMapping() {
+            return this.datasets?.length === 1
+                && this.referencedDatasets?.length === 1;
+        },
     },
     data() {
         return {
@@ -124,8 +136,8 @@ export default {
         },
         buildMapping() {
             this.referencedDatasets?.forEach(referencedDataset => {
-                const referencedDatasetKeyString = this.openmct.objects.makeKeyString(referencedDataset.identifier);
-                const datasetKeyString = this.openmct.objects.makeKeyString(this.datasets[0].identifier);
+                const referencedDatasetKeyString = this.makeKeyString(referencedDataset);
+                const datasetKeyString = this.makeKeyString(this.datasets[0]);
 
                 this.$set(this.mapping, referencedDatasetKeyString, datasetKeyString);
             });
@@ -133,6 +145,12 @@ export default {
         makeKeyString(domainObject) {
             return this.openmct.objects.makeKeyString(domainObject.identifier);
         },
+        getDatasetName(dataset) {
+            const keyString = this.makeKeyString(dataset);
+            const name = dataset.name || keyString;
+
+            return name;
+        },
         onChange(event) {
             this.validate();
 
diff --git a/src/actionModifiers/ImportExportWithDatasets/constants.js b/src/actionModifiers/ImportExportWithDatasets/constants.js
deleted file mode 100644
index 143c074..0000000
--- a/src/actionModifiers/ImportExportWithDatasets/constants.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const CONSTANTS = {
-    DATASETS_IDENTIFIER: 'datasets'
-}
diff --git a/src/actionModifiers/ImportExportWithDatasets/exportWithDatasetsModifier.js b/src/actionModifiers/ImportExportWithDatasets/exportWithDatasetsModifier.js
deleted file mode 100644
index 0ffd532..0000000
--- a/src/actionModifiers/ImportExportWithDatasets/exportWithDatasetsModifier.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { collectReferencedDatasets } from './DatasetCollection';
-import { CONSTANTS } from './constants';
-
-function exportWithDatasetsModifier(openmct) {
-    const exportAsJSONAction = openmct.actions._allActions['export.JSON'];
-
-    if (exportAsJSONAction) {
-        const originalInvokeFunction = exportAsJSONAction.invoke.bind(exportAsJSONAction);
-        let datasets;
-
-        exportAsJSONAction.invoke = async (objectPath) => {
-            const domainObject = objectPath[0];
-
-            datasets = await collectReferencedDatasets(openmct, domainObject);
-            
-            return originalInvokeFunction(objectPath);
-        }
-
-        const originalWrapTreeFunction = exportAsJSONAction._wrapTree.bind(exportAsJSONAction);
-
-        exportAsJSONAction._wrapTree = () => {
-            const treeWrapper = originalWrapTreeFunction();
-            treeWrapper[CONSTANTS.DATASETS_IDENTIFIER] = datasets;
-
-            // clean up exportWithDatasetsModifier scoped variables
-            datasets = undefined;
-
-            return treeWrapper;
-        };
-    }
-}
-
-export default exportWithDatasetsModifier;
diff --git a/src/actionModifiers/ImportExportWithDatasets/importWithDatasetsModifier.js b/src/actionModifiers/ImportExportWithDatasets/importWithDatasetsModifier.js
index a12e5c5..7d73b5a 100644
--- a/src/actionModifiers/ImportExportWithDatasets/importWithDatasetsModifier.js
+++ b/src/actionModifiers/ImportExportWithDatasets/importWithDatasetsModifier.js
@@ -1,4 +1,3 @@
-import { CONSTANTS } from './constants';
 import ImportWithDatasetsFormComponent from './ImportWithDatasetsFormComponent.vue';
 import Vue from 'vue';
 import DatasetCache from 'services/dataset/DatasetCache';
@@ -99,11 +98,12 @@ function importWithDatasetsModifier(openmct) {
         }
 
         if (success) {
-            try {
-                const datasetCache = DatasetCache();
+            const datasetCache = DatasetCache();
+
+            datasets = await datasetCache.getDomainObjects();
 
-                datasets = await datasetCache.getDomainObjects();
-                referencedDatasets = await getReferencedDatasets(json);
+            try {
+                referencedDatasets = getReferencedDatasets(json);
 
                 component.updateData(referencedDatasets, datasets);
             } catch(error) {
@@ -164,9 +164,35 @@ function importWithDatasetsModifier(openmct) {
     }
 
     function getReferencedDatasets(json) {
-        const referencedDatasets = json[CONSTANTS.DATASETS_IDENTIFIER];
+        const openmct = json.openmct;
+        const referencedDatasets = new Set();
+
+        Object.values(openmct)
+            .forEach(object => object.composition
+                ?.forEach(identifier => {
+                    if (referencesDataset(identifier)) {
+                        const datasetIdentifier = getDatasetIdentifier(identifier);
+                        referencedDatasets.add({ identifier: datasetIdentifier });
+                    }
+                }));
+
+        return Array.from(referencedDatasets);
+    }
+
+    function referencesDataset(identifier) {
+        return identifier.namespace === 'vista';
+    }
+
+    function getDatasetIdentifier(identifier) {
+        const parts = identifier.key.split(':');
+        const namespace = parts[parts.length - 2];
+        const key = parts[parts.length - 1];
+        const datasetIdentifier = {
+            namespace,
+            key
+        };
 
-        return referencedDatasets;
+        return datasetIdentifier;
     }
 }
 
diff --git a/src/actionModifiers/plugin.js b/src/actionModifiers/plugin.js
index 4c2bad3..1396366 100644
--- a/src/actionModifiers/plugin.js
+++ b/src/actionModifiers/plugin.js
@@ -1,16 +1,13 @@
 import preventImportIntoDatasetModifier from './preventImportIntoDatasetModifier';
-import exportWithDatasetsModifier from './ImportExportWithDatasets/exportWithDatasetsModifier';
 import importWithDatasetsModifier from './ImportExportWithDatasets/importWithDatasetsModifier';
 
-function plugin() {
+function ImportExportWithDatasetsPlugin() {
     return function install(openmct) {
-
         openmct.on('start', () => {
             preventImportIntoDatasetModifier(openmct);
-            exportWithDatasetsModifier(openmct);
             importWithDatasetsModifier(openmct);
         });
     }
 }
 
-export default plugin;
+export default ImportExportWithDatasetsPlugin;