diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
index d3ce5842..5fce4a5c 100644
--- a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
+++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
@@ -109,7 +109,7 @@ public BuildResult getResult() {
 
     };
 
-    private List<LinkedHashMap<String, List<LinkedHashMap<String, Object>>>> actions; // TODO: Should be improved.
+    private List<Map<String, Object>> actions; // TODO: Should be improved.
     private boolean building;
     private String description;
     private String displayName;
@@ -162,10 +162,8 @@ public boolean isBuilding() {
 
     public List<BuildCause> getCauses() {
         return actions.stream()
-                .filter(item -> item.containsKey("causes"))
-                .flatMap(item -> item.entrySet().stream())
-                .flatMap(sub -> sub.getValue().stream())
-                .map(item -> convertToBuildCause(item))
+                .flatMap(item -> ((List<Map<String, Object>>) item.getOrDefault("causes", List.of())).stream())
+                .map(this::convertToBuildCause)
                 .collect(toList());
     }
 
@@ -348,9 +346,7 @@ public List getActions() {
 
     public Map<String, Object> getParameters() {
         Map<String, Object> parameters = actions.stream()
-                .filter(item -> item.containsKey("parameters"))
-                .flatMap(item -> item.entrySet().stream())
-                .flatMap(sub -> sub.getValue().stream())
+                .flatMap(item -> ((List<Map<String, Object>>) item.getOrDefault("parameters", List.of())).stream())
                 .collect(toMap(k -> (String) k.get("name"), v -> v.get("value")));
 
         return parameters;