diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java
index a3ba467476..ed4455b844 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,8 @@ import ghidra.framework.data.OpenMode;
 import ghidra.framework.model.DomainFile;
 import ghidra.framework.model.DomainFolder;
 import ghidra.framework.options.Options;
-import ghidra.program.model.data.*;
+import ghidra.program.model.data.PointerDataType;
+import ghidra.program.model.data.StandAloneDataTypeManager;
 import ghidra.program.model.listing.DataTypeArchive;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.ProgramChangeRecord;
@@ -255,26 +256,17 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB implements DataType
 		return pointerSize > 0 && pointerSize <= PointerDataType.MAX_POINTER_SIZE_BYTES;
 	}
 
-	/**
-	 * @see ghidra.program.model.listing.Program#getDataTypeManager()
-	 */
 	@Override
-	public DataTypeManager getDataTypeManager() {
+	public ProjectDataTypeManager getDataTypeManager() {
 		return dataTypeManager;
 	}
 
-	/**
-	 * @see ghidra.program.model.listing.Program#getCreationDate()
-	 */
 	@Override
 	public Date getCreationDate() {
 		Options pl = getOptions(ARCHIVE_INFO);
 		return pl.getDate(DATE_CREATED, new Date(0));
 	}
 
-	/**
-	 * @see ghidra.program.model.listing.Program#getDefaultPointerSize()
-	 */
 	@Override
 	public int getDefaultPointerSize() {
 		// Not sure what size this should be so use 4 for now.
@@ -283,9 +275,6 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB implements DataType
 		return pl.getInt(DEFAULT_POINTER_SIZE, 4);
 	}
 
-	/**
-	 * @see ghidra.program.model.listing.Program#getChanges()
-	 */
 	@Override
 	public DataTypeArchiveDBChangeSet getChanges() {
 		return (DataTypeArchiveDBChangeSet) changeSet;
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataTypeArchive.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataTypeArchive.java
index 1ff2dbaa2b..70c261d5fa 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataTypeArchive.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataTypeArchive.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,6 +18,7 @@ package ghidra.program.model.listing;
 import java.util.Date;
 
 import ghidra.program.model.data.DataTypeManagerDomainObject;
+import ghidra.program.model.data.StandAloneDataTypeManager;
 
 /**
  * This interface represents the main entry point into an object which
@@ -37,11 +38,11 @@ public interface DataTypeArchive extends DataTypeManagerDomainObject {
 	public static final Date JANUARY_1_1970 = new Date(0);
 
 	/**
-	 * Determine if this archive has exclusive-write access which may be neccessary for some 
-	 * operations.
-	 * @return true if archive has exclusive-write access
+	 * Gets the associated standalone data type manager.
+	 * @return the data type manager.
 	 */
-	public boolean hasExclusiveAccess();
+	@Override
+	public StandAloneDataTypeManager getDataTypeManager();
 
 	/**
 	 * Gets the default pointer size as it may be stored within the data type archive.