diff --git a/src/main/java/org/apache/nifi/flow/VersionedComponentState.java b/src/main/java/org/apache/nifi/flow/VersionedComponentState.java
index 6b786e9..cab9670 100644
--- a/src/main/java/org/apache/nifi/flow/VersionedComponentState.java
+++ b/src/main/java/org/apache/nifi/flow/VersionedComponentState.java
@@ -26,7 +26,7 @@
 public class VersionedComponentState {
 
     private Map<String, String> clusterState;
-    private List<Map<String, String>> localNodeStates;
+    private List<VersionedNodeState> localNodeStates;
 
     @Schema(description = "The cluster-scoped state of the component, or null if not exported")
     public Map<String, String> getClusterState() {
@@ -38,11 +38,11 @@ public void setClusterState(final Map<String, String> clusterState) {
     }
 
     @Schema(description = "The local-scoped state of the component ordered by node ordinal index, or null if not exported")
-    public List<Map<String, String>> getLocalNodeStates() {
+    public List<VersionedNodeState> getLocalNodeStates() {
         return localNodeStates;
     }
 
-    public void setLocalNodeStates(final List<Map<String, String>> localNodeStates) {
+    public void setLocalNodeStates(final List<VersionedNodeState> localNodeStates) {
         this.localNodeStates = localNodeStates;
     }
 
diff --git a/src/main/java/org/apache/nifi/flow/VersionedNodeState.java b/src/main/java/org/apache/nifi/flow/VersionedNodeState.java
new file mode 100644
index 0000000..b9aa24f
--- /dev/null
+++ b/src/main/java/org/apache/nifi/flow/VersionedNodeState.java
@@ -0,0 +1,67 @@
+/*
+ * 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.nifi.flow;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.Map;
+import java.util.Objects;
+
+@Schema(description = "The state entries for a single node")
+public class VersionedNodeState {
+
+    private Map<String, String> state;
+
+    public VersionedNodeState() {
+    }
+
+    public VersionedNodeState(final Map<String, String> state) {
+        this.state = state;
+    }
+
+    @Schema(description = "The state key-value pairs for this node")
+    public Map<String, String> getState() {
+        return state;
+    }
+
+    public void setState(final Map<String, String> state) {
+        this.state = state;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final VersionedNodeState that = (VersionedNodeState) o;
+        return Objects.equals(state, that.state);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(state);
+    }
+
+    @Override
+    public String toString() {
+        return "VersionedNodeState[%s entries]".formatted(state != null ? state.size() : "null");
+    }
+}