techdebt: parameterise map typed API parameters
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
index 94c5d8f..dc0a6f0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
@@ -21,7 +21,6 @@
 import org.apache.cloudstack.api.response.TemplateResponse;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.Collection;
 import java.util.Map;
 
 public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
@@ -76,7 +75,7 @@
     protected Boolean isRoutingType;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].hypervisortoolsversion=xenserver61")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.CLEAN_UP_DETAILS,
             type = CommandType.BOOLEAN,
@@ -144,13 +143,11 @@
         return isRoutingType;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         if (this.details == null || this.details.isEmpty()) {
             return null;
         }
-
-        Collection paramsCollection = this.details.values();
-        return (Map) (paramsCollection.toArray())[0];
+        return this.details.values().iterator().next();
     }
 
     public boolean isCleanupDetails() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
index b6b975a..70c3371 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
@@ -16,7 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.account;
 
-import java.util.Collection;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -70,7 +69,7 @@
     private String networkDomain;
 
     @Parameter(name = ApiConstants.ACCOUNT_DETAILS, type = CommandType.MAP, description = "Details for the Account used to store specific parameters")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.API_KEY_ACCESS, type = CommandType.STRING, description = "Determines if Api key access for this user is enabled, disabled or inherits the value from its parent, the domain level setting api.key.access", since = "4.20.1.0", authorized = {RoleType.Admin})
     private String apiKeyAccess;
@@ -104,14 +103,11 @@
         return networkDomain;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         if (details == null || details.isEmpty()) {
             return null;
         }
-
-        Collection paramsCollection = details.values();
-        Map params = (Map)(paramsCollection.toArray())[0];
-        return params;
+        return details.values().iterator().next();
     }
 
     public String getApiKeyAccess() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
index d8fa212..11cf193 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -136,7 +136,7 @@
             type = CommandType.MAP,
             description = "Details in key/value pairs to be added to the extension-resource mapping. Use the format externaldetails[i].<key>=<value>. Example: externaldetails[0].endpoint.url=https://example.com",
             since = "4.21.0")
-    protected Map externalDetails;
+    protected Map<Integer, Map<String, String>> externalDetails;
 
     public String getOvm3Pool() {
          return ovm3pool;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
index 77d0557..d76718b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -66,7 +66,7 @@
             type = CommandType.MAP,
             description = "Details in key/value pairs to be added to the extension-resource mapping. Use the format externaldetails[i].<key>=<value>. Example: externaldetails[0].endpoint.url=https://example.com",
             since = "4.21.0")
-    protected Map externalDetails;
+    protected Map<Integer, Map<String, String>> externalDetails;
 
     public String getClusterName() {
         return clusterName;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
index c0e995c..bb65b7b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
@@ -58,7 +58,7 @@
     private String osName;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = false, description = "Map of (key/value pairs)")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name="forDisplay", type=CommandType.BOOLEAN, description="whether this guest OS is available for end users", authorized = {RoleType.Admin})
     private Boolean display;
@@ -79,7 +79,7 @@
         return osName;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         Map<String, String> detailsMap = new HashMap<>();
         if (!MapUtils.isEmpty(details)) {
             Collection<?> servicesCollection = details.values();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
index 035ff6a..da4b454 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
@@ -54,7 +54,7 @@
     private String osDisplayName;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = false, description = "Map of (key/value pairs)")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name="forDisplay", type=CommandType.BOOLEAN, description="whether this guest OS is available for end users", authorized = {RoleType.Admin})
     private Boolean display;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
index 5a17583..7a378f0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
@@ -86,7 +86,7 @@
             type = CommandType.MAP,
             description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue",
             since = "4.21.0")
-    protected Map externalDetails;
+    protected Map<Integer, Map<String, String>> externalDetails;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
index 585fd1b..e79083d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
@@ -50,7 +50,7 @@
     protected Long zoneId;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].copytemplatesfromothersecondarystorages=true")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
index 69bca7c..83985f1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -75,7 +75,7 @@
     private String annotation;
 
     @Parameter(name = ApiConstants.EXTERNAL_DETAILS, type = CommandType.MAP, description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue", since = "4.21.0")
-    protected Map externalDetails;
+    protected Map<Integer, Map<String, String>> externalDetails;
 
     @Parameter(name = ApiConstants.CLEAN_UP_EXTERNAL_DETAILS,
             type = CommandType.BOOLEAN,
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/NetworkOfferingBaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/NetworkOfferingBaseCmd.java
index 4b4d0dc..37b4207 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/NetworkOfferingBaseCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/NetworkOfferingBaseCmd.java
@@ -168,7 +168,7 @@
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.2.0", description = "Network offering details in key/value pairs."
             + " Supported keys are internallbprovider/publiclbprovider with service provider as a value, and"
             + " promiscuousmode/macaddresschanges/forgedtransmits with true/false as value to accept/reject the security settings if available for a nic/portgroup")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.EGRESS_DEFAULT_POLICY,
             type = CommandType.BOOLEAN,
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmd.java
index f1d9b67..dcd7cad 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmd.java
@@ -35,7 +35,6 @@
 import com.cloud.event.EventTypes;
 import com.cloud.user.Account;
 
-import java.util.Collection;
 import java.util.Map;
 
 @APICommand(name = "createBgpPeer",
@@ -91,7 +90,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "BGP peer details in key/value pairs.")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -134,8 +133,7 @@
         if (MapUtils.isEmpty(details)) {
             return null;
         }
-        Collection<String> paramsCollection = this.details.values();
-        return (Map<String, String>) (paramsCollection.toArray())[0];
+        return this.details.values().iterator().next();
     }
 
     @Override
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmd.java
index f45c1ee..ccc981f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmd.java
@@ -33,7 +33,6 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.commons.collections.MapUtils;
 
-import java.util.Collection;
 import java.util.Map;
 
 @APICommand(name = "updateBgpPeer",
@@ -74,7 +73,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "BGP peer details in key/value pairs.")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.CLEAN_UP_DETAILS,
             type = CommandType.BOOLEAN,
@@ -105,8 +104,7 @@
         if (MapUtils.isEmpty(details)) {
             return null;
         }
-        Collection<String> paramsCollection = this.details.values();
-        return (Map<String, String>) (paramsCollection.toArray())[0];
+        return this.details.values().iterator().next();
     }
 
     public boolean isCleanupDetails(){
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
index c6b21dc..f98c118 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
@@ -170,7 +170,7 @@
     private Boolean encrypt;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Details to specify disk offering parameters", since = "4.16")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
 
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index 5ea8e0e..2b00294 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -130,7 +130,7 @@
     private String deploymentPlanner;
 
     @Parameter(name = ApiConstants.SERVICE_OFFERING_DETAILS, type = CommandType.MAP, description = "Details for planner, used to store specific parameters")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.ROOT_DISK_SIZE, type = CommandType.LONG, since = "4.15", description = "The Root disk size in GB.")
     private Long rootDiskSize;
@@ -292,7 +292,7 @@
             type = CommandType.MAP,
             description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue",
             since = "4.21.0")
-    private Map externalDetails;
+    private Map<Integer, Map<String, String>> externalDetails;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
index 8e37499..95a94fa 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
@@ -98,7 +98,7 @@
             type = CommandType.MAP,
             description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue",
             since = "4.21.0")
-    private Map externalDetails;
+    private Map<Integer, Map<String, String>> externalDetails;
 
     @Parameter(name = ApiConstants.CLEAN_UP_EXTERNAL_DETAILS,
             type = CommandType.BOOLEAN,
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
index 72e2e96..c3195bc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
@@ -58,7 +58,7 @@
     @Parameter(name = ApiConstants.DETAILS,
                type = CommandType.MAP,
                description = "The details for the image store. Example: details[0].key=accesskey&details[0].value=s389ddssaa&details[1].key=secretkey&details[1].value=8dshfsss")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -108,7 +108,7 @@
         this.providerName = providerName;
     }
 
-    public void setDetails(Map<String, String> details) {
+    public void setDetails(Map<Integer, Map<String, String>> details) {
         this.details = details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddObjectStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddObjectStoragePoolCmd.java
index c24d61b..e913460 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddObjectStoragePoolCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddObjectStoragePoolCmd.java
@@ -51,7 +51,7 @@
     @Parameter(name = ApiConstants.DETAILS,
                type = CommandType.MAP,
                description = "the details for the object store. Example: details[0].key=accesskey&details[0].value=s389ddssaa&details[1].key=secretkey&details[1].value=8dshfsss")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.TAGS, type = CommandType.STRING, description = "the tags for the storage pool")
     private String tags;
@@ -103,7 +103,7 @@
         this.providerName = providerName;
     }
 
-    public void setDetails(Map<String, String> details) {
+    public void setDetails(Map<Integer, Map<String, String>> details) {
         this.details = details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
index 784b9e7..2bae6a7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
@@ -50,7 +50,7 @@
     private Long clusterId;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "The details for the storage pool")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "The name for the storage pool")
     private String storagePoolName;
@@ -103,7 +103,7 @@
         return clusterId;
     }
 
-    public Map getDetails() {
+    public Map<Integer, Map<String, String>> getDetails() {
         return details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
index 022bbb9..d8318d0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
@@ -53,7 +53,7 @@
     private String providerName;
 
     @Parameter(name=ApiConstants.DETAILS, type=CommandType.MAP, description = "The details for the image store. Example: details[0].key=accesskey&details[0].value=s389ddssaa&details[1].key=secretkey&details[1].value=8dshfsss")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
 
 
@@ -99,7 +99,7 @@
         this.providerName = providerName;
     }
 
-    public void setDetails(Map<String, String> details) {
+    public void setDetails(Map<Integer, Map<String, String>> details) {
         this.details = details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
index fa55b42..e45e2b7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
@@ -68,7 +68,7 @@
                             required = false,
                             description = "the details for the storage pool",
                             since = "4.19.0")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.URL,
                             type = CommandType.STRING,
@@ -131,11 +131,11 @@
         return ApiCommandResourceType.StoragePool;
     }
 
-    public Map<String,String> getDetails() {
+    public Map<Integer, Map<String, String>> getDetails() {
         return details;
     }
 
-    public void setDetails(Map<String,String> details) {
+    public void setDetails(Map<Integer, Map<String, String>> details) {
         this.details = details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CheckVmwareCbtMigrationPrerequisitesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CheckVmwareCbtMigrationPrerequisitesCmd.java
index cbbadc0..2263f68 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CheckVmwareCbtMigrationPrerequisitesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CheckVmwareCbtMigrationPrerequisitesCmd.java
@@ -113,7 +113,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "optional service offering custom parameters and migration details")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     public Long getZoneId() {
         return zoneId;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVmwareCbtMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVmwareCbtMigrationCmd.java
index 0746e40..3e3c89e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVmwareCbtMigrationCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVmwareCbtMigrationCmd.java
@@ -154,7 +154,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "optional migration details, including VDDK settings such as vddk.lib.dir, vddk.transports and vddk.thumbprint")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.NIC_NETWORK_LIST, type = CommandType.MAP,
             description = "VM NIC to network id mapping using keys NIC and network")
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
index 888ee66..76b9ff2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
@@ -76,7 +76,7 @@
     private String allocationState;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "The details for the Zone")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.DHCP_PROVIDER, type = CommandType.STRING, description = "The DHCP Provider for the Zone")
     private String dhcpProvider;
@@ -143,7 +143,7 @@
         return allocationState;
     }
 
-    public Map getDetails() {
+    public Map<Integer, Map<String, String>> getDetails() {
         return details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
index 3f46576..192ad3c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
@@ -112,7 +112,7 @@
     private Long userDataId;
 
     @Parameter(name = ApiConstants.USER_DATA_DETAILS, type = CommandType.MAP, description = "used to specify the parameters values for the variables in userdata.", since = "4.18.1")
-    private Map userDataDetails;
+    private Map<Integer, Map<String, String>> userDataDetails;
 
     @Parameter(name = ApiConstants.AUTOSCALE_USER_ID,
                type = CommandType.UUID,
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
index 4a0826b..a4986c4 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
@@ -108,7 +108,7 @@
 
     @Parameter(name = ApiConstants.USER_DATA_DETAILS, type = CommandType.MAP, description = "used to specify the parameters values for the variables in userdata.",
             since = "4.18.1")
-    private Map userDataDetails;
+    private Map<Integer, Map<String, String>> userDataDetails;
 
     @Parameter(name = ApiConstants.AUTOSCALE_USER_ID,
                type = CommandType.UUID,
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/CreateInstanceBootGroupReadinessRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/CreateInstanceBootGroupReadinessRuleCmd.java
index 43c5dcc..e841ed6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/CreateInstanceBootGroupReadinessRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/CreateInstanceBootGroupReadinessRuleCmd.java
@@ -17,7 +17,6 @@
 
 package org.apache.cloudstack.api.command.user.bootgroup;
 
-import java.util.Collection;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -75,7 +74,7 @@
     private Boolean enabled;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Rule-type-specific configuration, e.g. port/protocol, script, threshold_type/threshold_value")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     public Long getBootGroupId() {
         return bootGroupId;
@@ -105,8 +104,7 @@
         if (this.details == null || this.details.isEmpty()) {
             return null;
         }
-        Collection<String> paramsCollection = this.details.values();
-        return (Map<String, String>) (paramsCollection.toArray())[0];
+        return this.details.values().iterator().next();
     }
 
     @Override
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/UpdateInstanceBootGroupReadinessRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/UpdateInstanceBootGroupReadinessRuleCmd.java
index ea399f0..530c4f8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/UpdateInstanceBootGroupReadinessRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/bootgroup/UpdateInstanceBootGroupReadinessRuleCmd.java
@@ -17,7 +17,6 @@
 
 package org.apache.cloudstack.api.command.user.bootgroup;
 
-import java.util.Collection;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -60,7 +59,7 @@
     private Boolean enabled;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Rule-type-specific configuration")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     public Long getId() {
         return id;
@@ -78,8 +77,7 @@
         if (this.details == null || this.details.isEmpty()) {
             return null;
         }
-        Collection<String> paramsCollection = this.details.values();
-        return (Map<String, String>) (paramsCollection.toArray())[0];
+        return this.details.values().iterator().next();
     }
 
     @Override
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/dns/AddDnsServerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/dns/AddDnsServerCmd.java
index 21279b8..b70aac5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/dns/AddDnsServerCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/dns/AddDnsServerCmd.java
@@ -88,7 +88,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Details in key/value pairs using " +
             "format details[i].keyname=keyvalue. Example: details[0].pdnsServerId=localhost")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/CreateResourceScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/CreateResourceScheduleCmd.java
index f626810..8284e57 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/CreateResourceScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/CreateResourceScheduleCmd.java
@@ -68,7 +68,7 @@
     private Boolean enabled;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = false, description = "Map of (key/value pairs) details for the schedule.")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     public ApiCommandResourceType getResourceType() {
         ApiCommandResourceType type = EnumUtils.getEnumIgnoreCase(ApiCommandResourceType.class, resourceType);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/UpdateResourceScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/UpdateResourceScheduleCmd.java
index 5422588..b178a2c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/UpdateResourceScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/schedule/UpdateResourceScheduleCmd.java
@@ -59,7 +59,7 @@
     private Boolean enabled;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = false, description = "Map of (key/value pairs) details for the schedule.")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     public Long getId() {
         return id;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
index b5e41ff..cd16d49 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -16,7 +16,6 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.template;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -123,7 +122,7 @@
     private String templateTag;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Template details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].hypervisortoolsversion=xenserver61")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.IS_DYNAMICALLY_SCALABLE,
                type = CommandType.BOOLEAN,
@@ -214,14 +213,11 @@
         return StringUtils.isBlank(templateTag) ? null : templateTag;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         if (details == null || details.isEmpty()) {
             return null;
         }
-
-        Collection paramsCollection = details.values();
-        Map params = (Map)(paramsCollection.toArray())[0];
-        return params;
+        return details.values().iterator().next();
     }
 
     public boolean isDynamicallyScalable() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
index e6e178b..1a97af5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
@@ -19,7 +19,6 @@
 package org.apache.cloudstack.api.command.user.template;
 
 import java.net.MalformedURLException;
-import java.util.Collection;
 import java.util.Map;
 
 import com.cloud.cpu.CPU;
@@ -65,7 +64,7 @@
     private Integer bits;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, description = "Template details in key/value pairs.")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.IS_DYNAMICALLY_SCALABLE, type = CommandType.BOOLEAN, description = "True if Template contains XS/VMWare tools in order to support dynamic scaling of Instance CPU/memory")
     private Boolean isDynamicallyScalable;
@@ -125,13 +124,11 @@
         return bits;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         if (details == null || details.isEmpty()) {
             return null;
         }
-        Collection paramsCollection = details.values();
-        Map params = (Map)(paramsCollection.toArray())[0];
-        return params;
+        return details.values().iterator().next();
     }
 
     public Boolean isDynamicallyScalable() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
index 49992ac..57468d1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
@@ -18,7 +18,6 @@
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -136,7 +135,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "Template details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].hypervisortoolsversion=xenserver61")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.IS_DYNAMICALLY_SCALABLE,
                type = CommandType.BOOLEAN,
@@ -190,7 +189,7 @@
     private Long extensionId;
 
     @Parameter(name = ApiConstants.EXTERNAL_DETAILS, type = CommandType.MAP, description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].endpoint.url=urlvalue", since = "4.21.0")
-    protected Map externalDetails;
+    protected Map<Integer, Map<String, String>> externalDetails;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -282,14 +281,11 @@
         return StringUtils.isBlank(templateTag) ? null : templateTag;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         if (details == null || details.isEmpty()) {
             return null;
         }
-
-        Collection paramsCollection = details.values();
-        Map params = (Map)(paramsCollection.toArray())[0];
-        return params;
+        return details.values().iterator().next();
     }
 
     public Boolean isDynamicallyScalable() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterVnfTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterVnfTemplateCmd.java
index c3e99d5..b22cd92 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterVnfTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterVnfTemplateCmd.java
@@ -52,7 +52,7 @@
             type = CommandType.MAP,
             description = "VNF details in key/value pairs using format vnfdetails[i].keyname=keyvalue. "
                     + "Example: vnfdetails[0].vendor=xxx&&vnfdetails[0].version=2.0")
-    protected Map vnfDetails;
+    protected Map<Integer, Map<String, String>> vnfDetails;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateVnfTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateVnfTemplateCmd.java
index 7479dd3..c506122 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateVnfTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateVnfTemplateCmd.java
@@ -52,7 +52,7 @@
             type = CommandType.MAP,
             description = "VNF details in key/value pairs using format vnfdetails[i].keyname=keyvalue. "
                     + "Example: vnfdetails[0].vendor=xxx&&vnfdetails[0].version=2.0")
-    protected Map vnfDetails;
+    protected Map<Integer, Map<String, String>> vnfDetails;
 
     @Parameter(name = ApiConstants.CLEAN_UP_VNF_DETAILS,
             type = CommandType.BOOLEAN,
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/BaseDeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/BaseDeployVMCmd.java
index 9b5b88f..53e98a2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/BaseDeployVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/BaseDeployVMCmd.java
@@ -147,7 +147,7 @@
             since = "4.21.0",
             description = "Disk offering details for creating multiple data volumes. Mutually exclusive with diskOfferingId." +
                     " Example: datadisksdetails[0].diskofferingid=a2a73a84-19db-4852-8930-dfddef053341&datadisksdetails[0].size=10&datadisksdetails[0].miniops=100&datadisksdetails[0].maxiops=200&datadisksdetails[0].kmskeyid=<uuid>")
-    private Map dataDisksDetails;
+    private Map<Integer, Map<String, String>> dataDisksDetails;
 
     @Parameter(name = ApiConstants.GROUP, type = CommandType.STRING, description = "an optional group for the virtual machine")
     private String group;
@@ -170,7 +170,7 @@
     protected Long userdataId;
 
     @Parameter(name = ApiConstants.USER_DATA_DETAILS, type = CommandType.MAP, description = "used to specify the parameters values for the variables in userdata.", since = "4.18")
-    private Map userdataDetails;
+    private Map<Integer, Map<String, String>> userdataDetails;
 
     @Deprecated
     @Parameter(name = ApiConstants.SSH_KEYPAIR, type = CommandType.STRING, description = "name of the ssh key pair used to login to the virtual machine")
@@ -237,7 +237,7 @@
     protected Boolean displayVm;
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.3", description = "used to specify the custom parameters. 'extraconfig' is not allowed to be passed in details")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.DEPLOYMENT_PLANNER, type = CommandType.STRING, description = "Deployment planner to use for vm allocation. Available to ROOT admin only", since = "4.4", authorized = { RoleType.Admin })
     private String deploymentPlanner;
@@ -302,7 +302,7 @@
             type = CommandType.MAP,
             description = "Details in key/value pairs using format externaldetails[i].keyname=keyvalue. Example: externaldetails[0].server.type=typevalue",
             since = "4.21.0")
-    protected Map externalDetails;
+    protected Map<Integer, Map<String, String>> externalDetails;
 
     private List<VmDiskInfo> dataDiskInfoList;
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index 0a943fa..e5c2b9d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -159,7 +159,7 @@
         this.affinityGroupIdList = ids;
     }
 
-    public void setDetails(Map details) {
+    public void setDetails(Map<Integer, Map<String, String>> details) {
         this.details = details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMUserDataCmd.java
index 84422e0..b6a1384 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMUserDataCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMUserDataCmd.java
@@ -70,7 +70,7 @@
     private Long userdataId;
 
     @Parameter(name = ApiConstants.USER_DATA_DETAILS, type = CommandType.MAP, description = "Used to specify the parameters values for the variables in userdata.")
-    private Map userdataDetails;
+    private Map<Integer, Map<String, String>> userdataDetails;
 
     //Owner information
     @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "An optional Account for the Instance. Must be used with domainId.")
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
index d345934..092c2ab 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
@@ -75,7 +75,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, since = "4.19.1",
                description = "used to specify the custom parameters")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.EXPUNGE,
                type = CommandType.BOOLEAN,
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
index 618d14d..3a5807f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
@@ -98,7 +98,7 @@
     private Long userdataId;
 
     @Parameter(name = ApiConstants.USER_DATA_DETAILS, type = CommandType.MAP, description = "Used to specify the parameters values for the variables in userdata.", since = "4.18")
-    private Map userdataDetails;
+    private Map<Integer, Map<String, String>> userdataDetails;
 
     @Parameter(name = ApiConstants.DISPLAY_VM, type = CommandType.BOOLEAN, description = "An optional field, whether to the display the Instance to the end User or not.", authorized = {RoleType.Admin})
     private Boolean displayVm;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
index 9e1c105..9babd7d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/volume/AddResourceDetailCmd.java
@@ -38,7 +38,7 @@
     /////////////////////////////////////////////////////
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP, required = true, description = "Map of (key/value pairs)")
-    private Map details;
+    private Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Type of the resource")
     private String resourceType;
@@ -53,7 +53,7 @@
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         return TaggedResources.parseKeyValueMap(details, true);
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BgpPeerResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BgpPeerResponse.java
index 344e65c..5f654b9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/BgpPeerResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/BgpPeerResponse.java
@@ -84,7 +84,7 @@
 
     @SerializedName(ApiConstants.DETAILS)
     @Param(description = "additional key/value details of the bgp peer")
-    private Map details;
+    private Map<BgpPeer.Detail, String> details;
 
     public void setId(String id) {
         this.id = id;
@@ -138,7 +138,7 @@
         this.domainName = domainName;
     }
 
-    public void setDetails(Map details) {
+    public void setDetails(Map<BgpPeer.Detail, String> details) {
         this.details = details;
     }
 
@@ -194,7 +194,7 @@
         return projectName;
     }
 
-    public Map getDetails() {
+    public Map<BgpPeer.Detail, String> getDetails() {
         return details;
     }
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
index 52804cc..11ff93b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
@@ -289,7 +289,7 @@
 
     @SerializedName(ApiConstants.DETAILS)
     @Param(description = "Host details in key/value pairs.", since = "4.5")
-    private Map details;
+    private Map<String, String> details;
 
     @SerializedName(ApiConstants.ANNOTATION)
     @Param(description = "The last annotation set on this host by an admin", since = "4.11")
@@ -680,13 +680,13 @@
         this.username = username;
     }
 
-    public void setDetails(Map details, Hypervisor.HypervisorType hypervisorType) {
+    public void setDetails(Map<String, String> details, Hypervisor.HypervisorType hypervisorType) {
 
         if (details == null) {
             return;
         }
 
-        final Map detailsCopy = new HashMap(details);
+        final Map<String, String> detailsCopy = new HashMap<>(details);
 
         // Fix for CVE ID 2015-3251
         // Remove sensitive host credential information from
@@ -695,7 +695,7 @@
         detailsCopy.remove("password");
 
         if (detailsCopy.containsKey(Host.HOST_VOLUME_ENCRYPTION)) {
-            this.setEncryptionSupported(Boolean.parseBoolean((String) detailsCopy.get(Host.HOST_VOLUME_ENCRYPTION)));
+            this.setEncryptionSupported(Boolean.parseBoolean(detailsCopy.get(Host.HOST_VOLUME_ENCRYPTION)));
             detailsCopy.remove(Host.HOST_VOLUME_ENCRYPTION);
         } else {
             this.setEncryptionSupported(new Boolean(false)); // default
@@ -703,7 +703,7 @@
 
         if (Hypervisor.HypervisorType.KVM.equals(hypervisorType)) {
             if (detailsCopy.containsKey(Host.HOST_INSTANCE_CONVERSION)) {
-                this.setInstanceConversionSupported(Boolean.parseBoolean((String) detailsCopy.get(Host.HOST_INSTANCE_CONVERSION)));
+                this.setInstanceConversionSupported(Boolean.parseBoolean(detailsCopy.get(Host.HOST_INSTANCE_CONVERSION)));
                 detailsCopy.remove(Host.HOST_INSTANCE_CONVERSION);
             } else {
                 this.setInstanceConversionSupported(new Boolean(false)); // default
@@ -713,7 +713,7 @@
         this.details = detailsCopy;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         return details;
     }
 
@@ -988,7 +988,7 @@
         return hasEnoughCapacity;
     }
 
-    public void setDetails(Map details) {
+    public void setDetails(Map<String, String> details) {
         this.details = details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
index 740dd23..a475283 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java
@@ -121,7 +121,7 @@
 
     @SerializedName(ApiConstants.DETAILS)
     @Param(description = "Additional key/value details tied with network offering", since = "4.2.0")
-    private Map details;
+    private Map<NetworkOffering.Detail, String> details;
 
     @SerializedName(ApiConstants.EGRESS_DEFAULT_POLICY)
     @Param(description = "True if guest network default egress policy is allow; false if default egress policy is deny")
@@ -255,7 +255,7 @@
         this.isPersistent = isPersistent;
     }
 
-    public void setDetails(Map details) {
+    public void setDetails(Map<NetworkOffering.Detail, String> details) {
         this.details = details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkProtocolResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkProtocolResponse.java
index 775333f..4098988 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkProtocolResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkProtocolResponse.java
@@ -40,7 +40,7 @@
 
     @SerializedName(ApiConstants.DETAILS)
     @Param(description = "the details of the protocol parameter")
-    private Map details;
+    private Map<String, String> details;
 
     public NetworkProtocolResponse(Integer index, String name, String description) {
         this.index = index;
@@ -72,17 +72,17 @@
         this.description = description;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         return details;
     }
 
-    public void setDetails(Map details) {
+    public void setDetails(Map<String, String> details) {
         this.details = details;
     }
 
     public void addDetail(String key, String value) {
         if (this.details == null) {
-            this.details = new LinkedHashMap();
+            this.details = new LinkedHashMap<>();
         }
         this.details.put(key, value);
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
index e08c601..2b7e1d6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UserVmResponse.java
@@ -346,7 +346,7 @@
 
     @SerializedName(ApiConstants.DETAILS)
     @Param(description = "Instance details in key/value pairs.", since = "4.2.1")
-    private Map details;
+    private Map<String, String> details;
 
     @SerializedName("readonlydetails")
     @Param(description = "List of read-only Instance details as comma separated string.", since = "4.16.0")
@@ -1115,7 +1115,7 @@
         this.serviceState = state;
     }
 
-    public void setDetails(Map details) {
+    public void setDetails(Map<String, String> details) {
         this.details = details;
     }
 
@@ -1143,7 +1143,7 @@
         this.tagIds = tagIds;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         return details;
     }
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VolumeForImportResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VolumeForImportResponse.java
index 803f154..609fe86 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/VolumeForImportResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/VolumeForImportResponse.java
@@ -72,7 +72,7 @@
 
     @SerializedName(ApiConstants.DETAILS)
     @Param(description = "volume details in key/value pairs.")
-    private Map details;
+    private Map<VolumeOnStorageTO.Detail, String> details;
 
     @SerializedName(ApiConstants.CHAIN_INFO)
     @Param(description = "the chain info of the volume")
@@ -158,11 +158,11 @@
         this.storagePoolType = storagePoolType;
     }
 
-    public Map getDetails() {
+    public Map<VolumeOnStorageTO.Detail, String> getDetails() {
         return details;
     }
 
-    public void setDetails(Map details) {
+    public void setDetails(Map<VolumeOnStorageTO.Detail, String> details) {
         this.details = details;
     }
 
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmdTest.java
new file mode 100644
index 0000000..25098a5
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmdTest.java
@@ -0,0 +1,45 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.account;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class UpdateAccountCmdTest {
+
+    @Test
+    public void testGetDetailsEmpty() {
+        final UpdateAccountCmd cmd = new UpdateAccountCmd();
+        Assert.assertNull(cmd.getDetails());
+        ReflectionTestUtils.setField(cmd, "details", new HashMap<>());
+        Assert.assertNull(cmd.getDetails());
+    }
+
+    @Test
+    public void testGetDetailsReturnsFirstEntry() {
+        final UpdateAccountCmd cmd = new UpdateAccountCmd();
+        Map<String, String> entry = Map.of("somekey", "somevalue");
+        Map<Integer, Map<String, String>> details = new HashMap<>();
+        details.put(0, entry);
+        ReflectionTestUtils.setField(cmd, "details", details);
+        Assert.assertEquals(entry, cmd.getDetails());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmdTest.java
index 55e9c8d..d0ff0c3 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmdTest.java
@@ -16,6 +16,9 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.template;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -45,4 +48,22 @@
         ReflectionTestUtils.setField(cmd, "accountName", accountName);
         Assert.assertEquals(accountName, cmd.getAccountName());
     }
+
+    @Test
+    public void testGetDetailsEmpty() {
+        final CreateTemplateCmd cmd = new CreateTemplateCmd();
+        Assert.assertNull(cmd.getDetails());
+        ReflectionTestUtils.setField(cmd, "details", new HashMap<>());
+        Assert.assertNull(cmd.getDetails());
+    }
+
+    @Test
+    public void testGetDetailsReturnsFirstEntry() {
+        final CreateTemplateCmd cmd = new CreateTemplateCmd();
+        Map<String, String> entry = Map.of("hypervisortoolsversion", "xenserver61");
+        Map<Integer, Map<String, String>> details = new HashMap<>();
+        details.put(0, entry);
+        ReflectionTestUtils.setField(cmd, "details", details);
+        Assert.assertEquals(entry, cmd.getDetails());
+    }
 }
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmdTest.java
new file mode 100644
index 0000000..2d3b4d9
--- /dev/null
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmdTest.java
@@ -0,0 +1,45 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.user.template;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class GetUploadParamsForTemplateCmdTest {
+
+    @Test
+    public void testGetDetailsEmpty() {
+        final GetUploadParamsForTemplateCmd cmd = new GetUploadParamsForTemplateCmd();
+        Assert.assertNull(cmd.getDetails());
+        ReflectionTestUtils.setField(cmd, "details", new HashMap<>());
+        Assert.assertNull(cmd.getDetails());
+    }
+
+    @Test
+    public void testGetDetailsReturnsFirstEntry() {
+        final GetUploadParamsForTemplateCmd cmd = new GetUploadParamsForTemplateCmd();
+        Map<String, String> entry = Map.of("hypervisortoolsversion", "xenserver61");
+        Map<Integer, Map<String, String>> details = new HashMap<>();
+        details.put(0, entry);
+        ReflectionTestUtils.setField(cmd, "details", details);
+        Assert.assertEquals(entry, cmd.getDetails());
+    }
+}
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java
index a063f6c..3910414 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmdTest.java
@@ -33,6 +33,8 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 @RunWith(MockitoJUnitRunner.class)
 public class RegisterTemplateCmdTest {
@@ -149,4 +151,22 @@
         ReflectionTestUtils.setField(registerTemplateCmd , "templateName", netName);
         Assert.assertEquals(registerTemplateCmd.getDisplayText(), netName);
     }
+
+    @Test
+    public void testGetDetailsEmpty() {
+        registerTemplateCmd = new RegisterTemplateCmd();
+        Assert.assertNull(registerTemplateCmd.getDetails());
+        ReflectionTestUtils.setField(registerTemplateCmd, "details", new HashMap<>());
+        Assert.assertNull(registerTemplateCmd.getDetails());
+    }
+
+    @Test
+    public void testGetDetailsReturnsFirstEntry() {
+        registerTemplateCmd = new RegisterTemplateCmd();
+        Map<String, String> entry = Map.of("hypervisortoolsversion", "xenserver61");
+        Map<Integer, Map<String, String>> details = new HashMap<>();
+        details.put(0, entry);
+        ReflectionTestUtils.setField(registerTemplateCmd, "details", details);
+        Assert.assertEquals(entry, registerTemplateCmd.getDetails());
+    }
 }
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmdTest.java
index 03e558b..f8fd870 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmdTest.java
@@ -16,6 +16,9 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.template;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,4 +49,22 @@
         ReflectionTestUtils.setField(cmd, "templateTag", tag);
         Assert.assertEquals(tag, cmd.getTemplateTag());
     }
+
+    @Test
+    public void testGetDetailsEmpty() {
+        UpdateTemplateCmd cmd = new UpdateTemplateCmd();
+        Assert.assertNull(cmd.getDetails());
+        ReflectionTestUtils.setField(cmd, "details", new HashMap<>());
+        Assert.assertNull(cmd.getDetails());
+    }
+
+    @Test
+    public void testGetDetailsReturnsFirstEntry() {
+        UpdateTemplateCmd cmd = new UpdateTemplateCmd();
+        Map<String, String> entry = Map.of("hypervisortoolsversion", "xenserver61");
+        Map<Integer, Map<String, String>> details = new HashMap<>();
+        details.put(0, entry);
+        ReflectionTestUtils.setField(cmd, "details", details);
+        Assert.assertEquals(entry, cmd.getDetails());
+    }
 }
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmdTest.java
index b5fc799..eeb3b51 100644
--- a/api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmdTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmdTest.java
@@ -757,8 +757,8 @@
 
     @Test
     public void testSetDetails() {
-        Map<String, String> details = new HashMap<>();
-        details.put("key", "value");
+        Map<Integer, Map<String, String>> details = new HashMap<>();
+        details.put(0, Map.of("key", "value"));
         cmd.setDetails(details);
         assertEquals(details, ReflectionTestUtils.getField(cmd, "details"));
     }
diff --git a/api/src/test/java/org/apache/cloudstack/api/response/BgpPeerResponseTest.java b/api/src/test/java/org/apache/cloudstack/api/response/BgpPeerResponseTest.java
index 7c82eb8..c5132bd 100644
--- a/api/src/test/java/org/apache/cloudstack/api/response/BgpPeerResponseTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/response/BgpPeerResponseTest.java
@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.response;
 
+import org.apache.cloudstack.network.BgpPeer;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -59,8 +60,8 @@
         response.setZoneId(zoneId);
         response.setZoneName(zoneName);
         response.setCreated(created);
-        Map<String, String> details = new HashMap<>();
-        details.put("key", "value");
+        Map<BgpPeer.Detail, String> details = new HashMap<>();
+        details.put(BgpPeer.Detail.EBGP_MultiHop, "value");
         response.setDetails(details);
 
         Assert.assertEquals(uuid, response.getId());
diff --git a/api/src/test/java/org/apache/cloudstack/api/response/HostResponseTest.java b/api/src/test/java/org/apache/cloudstack/api/response/HostResponseTest.java
index 04e3ad7..9c23b9a 100644
--- a/api/src/test/java/org/apache/cloudstack/api/response/HostResponseTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/response/HostResponseTest.java
@@ -23,6 +23,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.cloud.host.Host;
 import com.cloud.hypervisor.Hypervisor;
 
 public final class HostResponseTest extends TestCase {
@@ -79,4 +80,22 @@
         assertEquals(expectedDetails, actualDetails);
 
     }
+
+    @Test
+    public void testSetDetailsExtractsCapabilityFlags() {
+
+        final HostResponse hostResponse = new HostResponse();
+        final Map<String, String> details = new HashMap<>();
+
+        details.put(VALID_KEY, VALID_VALUE);
+        details.put(Host.HOST_VOLUME_ENCRYPTION, "true");
+        details.put(Host.HOST_INSTANCE_CONVERSION, "true");
+
+        hostResponse.setDetails(details, Hypervisor.HypervisorType.KVM);
+
+        assertEquals(Boolean.TRUE, hostResponse.getEncryptionSupported());
+        assertEquals(Boolean.TRUE, hostResponse.getInstanceConversionSupported());
+        assertEquals(Map.of(VALID_KEY, VALID_VALUE), hostResponse.getDetails());
+
+    }
 }
diff --git a/api/src/test/java/org/apache/cloudstack/api/response/VolumeForImportResponseTest.java b/api/src/test/java/org/apache/cloudstack/api/response/VolumeForImportResponseTest.java
index 7d05388..602d244 100644
--- a/api/src/test/java/org/apache/cloudstack/api/response/VolumeForImportResponseTest.java
+++ b/api/src/test/java/org/apache/cloudstack/api/response/VolumeForImportResponseTest.java
@@ -18,6 +18,7 @@
 
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.storage.Storage;
+import org.apache.cloudstack.storage.volume.VolumeOnStorageTO;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -57,8 +58,8 @@
         response.setStoragePoolName(storagePoolName);
         response.setStoragePoolId(storagePoolId);
         response.setChainInfo(chainInfo);
-        Map<String, String> details = new HashMap<>();
-        details.put("key", "value");
+        Map<VolumeOnStorageTO.Detail, String> details = new HashMap<>();
+        details.put(VolumeOnStorageTO.Detail.FILE_FORMAT, "value");
         response.setDetails(details);
 
         Assert.assertEquals(path, response.getPath());
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java
index dcea754..5a35097 100644
--- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java
@@ -101,7 +101,7 @@
             type = CommandType.MAP,
             description = "Details in key/value pairs using format details[i].keyname=keyvalue. "
                     + "Example: details[0].vendor=xxx&&details[0].version=2.0")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java
index 9d76a7e..2ec9294 100644
--- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java
@@ -81,7 +81,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].endpoint.url=urlvalue")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.RESERVED_RESOURCE_DETAILS, type = CommandType.STRING,
             description = "Resource detail names as comma separated string that should be reserved and not visible " +
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java
index e8f71d7..57fe9b9 100644
--- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java
@@ -66,7 +66,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].endpoint.url=urlvalue")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java
index bb03be0..a7f87c7 100644
--- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java
@@ -107,7 +107,7 @@
             type = CommandType.MAP,
             description = "Details in key/value pairs using format details[i].keyname=keyvalue. "
                     + "Example: details[0].vendor=xxx&&details[0].version=2.0")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.CLEAN_UP_DETAILS,
             type = CommandType.BOOLEAN,
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java
index 5baaea1..8c1a33a 100644
--- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java
@@ -69,7 +69,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].endpoint.url=urlvalue")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.CLEAN_UP_DETAILS,
             type = CommandType.BOOLEAN,
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateRegisteredExtensionCmd.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateRegisteredExtensionCmd.java
index 6c755ec..3ecd87d 100644
--- a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateRegisteredExtensionCmd.java
+++ b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateRegisteredExtensionCmd.java
@@ -61,7 +61,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "Details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].endpoint.url=urlvalue")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Parameter(name = ApiConstants.CLEAN_UP_DETAILS,
             type = CommandType.BOOLEAN,
diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java
index 8bf0f36..d2fe8fd 100644
--- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java
+++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/CreateKubernetesClusterCmd.java
@@ -216,7 +216,7 @@
                     "Example: cniconfigdetails[0].key=accesskey&cniconfigdetails[0].value=s389ddssaa&" +
                     "cniconfigdetails[1].key=secretkey&cniconfigdetails[1].value=8dshfsss",
             since = "4.21.0")
-    private Map cniConfigDetails;
+    private Map<Integer, Map<String, String>> cniConfigDetails;
 
     @Parameter(name = ApiConstants.ENABLE_CSI, type = CommandType.BOOLEAN, description = "if true, setups up CloudStack CSI driver", since = "4.22.0")
     private Boolean enableCsi;
@@ -381,7 +381,7 @@
         return asNumber;
     }
 
-    public Map getCniConfigDetails() {
+    public Map<String, String> getCniConfigDetails() {
         return convertDetailsToMap(cniConfigDetails);
     }
 
diff --git a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/RegisterOAuthProviderCmd.java b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/RegisterOAuthProviderCmd.java
index 12d3bc6..4d6fb58 100644
--- a/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/RegisterOAuthProviderCmd.java
+++ b/plugins/user-authenticators/oauth2/src/main/java/org/apache/cloudstack/oauth2/api/command/RegisterOAuthProviderCmd.java
@@ -15,7 +15,6 @@
 package org.apache.cloudstack.oauth2.api.command;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -84,7 +83,7 @@
 
     @Parameter(name = ApiConstants.DETAILS, type = CommandType.MAP,
             description = "Any OAuth provider details in key/value pairs using format details[i].keyname=keyvalue. Example: details[0].clientsecret=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")
-    protected Map details;
+    protected Map<Integer, Map<String, String>> details;
 
     @Override
     public long getEntityOwnerId() {
@@ -134,12 +133,11 @@
         return enabled;
     }
 
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         if (MapUtils.isEmpty(details)) {
             return null;
         }
-        Collection paramsCollection = this.details.values();
-        return (Map) (paramsCollection.toArray())[0];
+        return this.details.values().iterator().next();
     }
 
     @Inject
diff --git a/server/src/main/java/com/cloud/storage/upload/params/TemplateUploadParams.java b/server/src/main/java/com/cloud/storage/upload/params/TemplateUploadParams.java
index aae7c0b..202615b 100644
--- a/server/src/main/java/com/cloud/storage/upload/params/TemplateUploadParams.java
+++ b/server/src/main/java/com/cloud/storage/upload/params/TemplateUploadParams.java
@@ -29,7 +29,7 @@
                                 Boolean isExtractable, String format, Long guestOSId,
                                 Long zoneId, Hypervisor.HypervisorType hypervisorType, String chksum,
                                 String templateTag, long templateOwnerId,
-                                Map details, Boolean sshkeyEnabled,
+                                Map<String, String> details, Boolean sshkeyEnabled,
                                 Boolean isDynamicallyScalable, Boolean isRoutingType, boolean deployAsIs,
                                 boolean forCks, String templateType) {
         super(userId, name, displayText, arch, bits, passwordEnabled, requiresHVM, isPublic, featured, isExtractable,
diff --git a/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java b/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java
index 5738cfa..283b999 100644
--- a/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java
+++ b/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java
@@ -41,7 +41,7 @@
     boolean isBootable();
     String getTemplateTag();
     long getTemplateOwnerId();
-    Map getDetails();
+    Map<String, String> getDetails();
     boolean isSshKeyEnabled();
     String getImageStoreUuid();
     boolean isDynamicallyScalable();
diff --git a/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java b/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java
index 945551a..36ec10e 100644
--- a/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java
+++ b/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java
@@ -41,7 +41,7 @@
     private boolean bootable;
     private String templateTag;
     private long templateOwnerId;
-    private Map details;
+    private Map<String, String> details;
     private boolean sshkeyEnabled;
     private boolean isDynamicallyScalable;
     private boolean isRoutingType;
@@ -56,7 +56,7 @@
                      boolean isExtractable, String format, Long guestOSId,
                      Long zoneId, Hypervisor.HypervisorType hypervisorType, String checksum,
                      String templateTag, long templateOwnerId,
-                     Map details, boolean sshkeyEnabled,
+                     Map<String, String> details, boolean sshkeyEnabled,
                      boolean isDynamicallyScalable, boolean isRoutingType, boolean deployAsIs,
                      boolean forCks, String templateType) {
         this.userId = userId;
@@ -195,7 +195,7 @@
     }
 
     @Override
-    public Map getDetails() {
+    public Map<String, String> getDetails() {
         return details;
     }