diff --git a/src/main/java/net/pingex/dcf/commands/audit/AuditResult.java b/src/main/java/net/pingex/dcf/commands/audit/AuditResult.java
index 4e87a8a..52d2b8a 100644
--- a/src/main/java/net/pingex/dcf/commands/audit/AuditResult.java
+++ b/src/main/java/net/pingex/dcf/commands/audit/AuditResult.java
@@ -1,6 +1,7 @@
 package net.pingex.dcf.commands.audit;
 
-import java.util.Map;
+import java.util.List;
+import java.util.Map.Entry;
 
 /**
  * This class contains results for an audit.
@@ -20,7 +21,7 @@ public class AuditResult
 	/**
 	 * Sub audits.
 	 */
-	private Map<IAuditComponentProvider, AuditResult> subAuditsResults;
+	private List<Entry<IAuditComponentProvider, AuditResult>> subAuditsResults;
 
 	/**
 	 * Full constructor, with sub audits.
@@ -28,7 +29,7 @@ public class AuditResult
 	 * @param message Optional message, pass `null` for no message.
 	 * @param subAuditsResults A result for each sub audit.
 	 */
-	public AuditResult(ResultCode opCode, String message, Map<IAuditComponentProvider, AuditResult> subAuditsResults)
+	public AuditResult(ResultCode opCode, String message, List<Entry<IAuditComponentProvider, AuditResult>> subAuditsResults)
 	{
 		this.opCode = opCode;
 		this.message = message;
@@ -44,6 +45,7 @@ public class AuditResult
 	{
 		this.opCode = opCode;
 		this.message = message;
+		this.subAuditsResults = null;
 	}
 
 	/**
@@ -63,11 +65,10 @@ public class AuditResult
 	}
 
 	/**
-	 * Sub audits.
-	 * @return A map of these subaudits.
+	 * Sub audits, if any.
 	 * @throws UnsupportedOperationException in case there is not sub audits.
 	 */
-	public Map<IAuditComponentProvider, AuditResult> getSubAuditsResults() throws UnsupportedOperationException
+	public List<Entry<IAuditComponentProvider, AuditResult>> getSubAuditsResults() throws UnsupportedOperationException
 	{
 		if(subAuditsResults != null)
 			return subAuditsResults;
@@ -95,7 +96,7 @@ public class AuditResult
 		WARN,
 
 		/**
-		 * Test has been ignored.
+		 * Test was ignored.
 		 */
 		NOOP
 	}