diff --git a/audio/aidl/vts/ModuleConfig.h b/audio/aidl/vts/ModuleConfig.h
index 2e86b97..0e2738b 100644
--- a/audio/aidl/vts/ModuleConfig.h
+++ b/audio/aidl/vts/ModuleConfig.h
@@ -37,6 +37,8 @@
     android::binder::Status getStatus() const { return mStatus; }
     std::string getError() const { return mStatus.toString8().c_str(); }
 
+    std::vector<android::media::audio::common::AudioPort> getAttachedDevicePorts() const;
+    std::vector<android::media::audio::common::AudioPort> getExternalDevicePorts() const;
     std::vector<android::media::audio::common::AudioPort> getInputMixPorts() const;
     std::vector<android::media::audio::common::AudioPort> getOutputMixPorts() const;
     std::vector<android::media::audio::common::AudioPort> getMixPorts(bool isInput) const {
@@ -59,6 +61,10 @@
     std::optional<SrcSinkPair> getRoutableSrcSinkPair(bool isInput) const;
     std::vector<SrcSinkGroup> getRoutableSrcSinkGroups(bool isInput) const;
 
+    std::vector<android::media::audio::common::AudioPortConfig>
+    getPortConfigsForAttachedDevicePorts() const {
+        return generateAudioDevicePortConfigs(getAttachedDevicePorts(), false);
+    }
     std::vector<android::media::audio::common::AudioPortConfig> getPortConfigsForMixPorts() const {
         auto inputs = generateInputAudioMixPortConfigs(getInputMixPorts(), false);
         auto outputs = generateOutputAudioMixPortConfigs(getOutputMixPorts(), false);
@@ -98,15 +104,18 @@
         }
     }
 
+    std::vector<android::media::audio::common::AudioPortConfig> getPortConfigsForDevicePort(
+            const android::media::audio::common::AudioPort& port) const {
+        return generateAudioDevicePortConfigs({port}, false);
+    }
     android::media::audio::common::AudioPortConfig getSingleConfigForDevicePort(
             const android::media::audio::common::AudioPort& port) const {
-        for (const auto& config : mInitialConfigs) {
-            if (config.portId == port.id) return config;
-        }
         const auto config = generateAudioDevicePortConfigs({port}, true);
         return *config.begin();
     }
 
+    std::string toString() const;
+
   private:
     std::vector<android::media::audio::common::AudioPortConfig> generateInputAudioMixPortConfigs(
             const std::vector<android::media::audio::common::AudioPort>& ports,
@@ -117,7 +126,8 @@
 
     // Unlike MixPorts, the generator for DevicePorts always returns a non-empty
     // vector for a non-empty input port list. If there are no profiles in the
-    // port, a vector with an empty config is returned.
+    // port, its initial configs are looked up, if there are none,
+    // then an empty config is used, assuming further negotiation via setAudioPortConfig.
     std::vector<android::media::audio::common::AudioPortConfig> generateAudioDevicePortConfigs(
             const std::vector<android::media::audio::common::AudioPort>& ports,
             bool singleProfile) const;
@@ -127,5 +137,6 @@
     std::vector<android::media::audio::common::AudioPortConfig> mInitialConfigs;
     std::set<int32_t> mAttachedSinkDevicePorts;
     std::set<int32_t> mAttachedSourceDevicePorts;
+    std::set<int32_t> mExternalDevicePorts;
     std::vector<android::hardware::audio::core::AudioRoute> mRoutes;
 };
