diff --git a/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java b/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java
index 0c2d2f4..21c2732 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java
@@ -55,12 +55,11 @@
     private JsonNode json(Iterable<TopologyCluster> clusters) {
         ObjectMapper mapper = new ObjectMapper();
         ArrayNode result = mapper.createArrayNode();
-        for (TopologyCluster cluster : clusters) {
-            result.add(mapper.createObjectNode()
-                               .put("id", cluster.id().index())
-                               .put("deviceCount", cluster.deviceCount())
-                               .put("linkCount", cluster.linkCount()));
-        }
+
+        clusters.spliterator()
+                .forEachRemaining(cluster ->
+                        result.add(jsonForEntity(cluster, TopologyCluster.class)));
+
         return result;
     }