diff --git a/cmd/mithril-go/main.go b/cmd/mithril-go/main.go
index 58c578e..b253c61 100644
--- a/cmd/mithril-go/main.go
+++ b/cmd/mithril-go/main.go
@@ -142,7 +142,11 @@ func cmdList(ctx context.Context, args []string) int {
 		return exitNetwork
 	}
 	if *asJSON {
-		return emitJSON(map[string]any{"network": n.Name, "snapshots": snaps})
+		return emitJSON(map[string]any{
+			"network":   n.Name,
+			"count":     len(snaps),
+			"snapshots": snaps,
+		})
 	}
 	tw := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	fmt.Fprintln(tw, "HASH\tEPOCH\tIMMUTABLE\tSIZE\tCREATED")
diff --git a/cmd/mithril-go/mcp.go b/cmd/mithril-go/mcp.go
index 93862cf..3e8f9a7 100644
--- a/cmd/mithril-go/mcp.go
+++ b/cmd/mithril-go/mcp.go
@@ -254,6 +254,7 @@ func registerMCPTools(s *mcp.Server) {
 				verr := verify.GenesisFromJSON(vk, cert.SignedMessage, cert.GenesisSignature, cert.ProtocolMessage)
 				return map[string]any{
 					"kind":      "genesis",
+					"hash":      cert.Hash,
 					"cert_hash": cert.Hash,
 					"epoch":     cert.Epoch,
 					"verified":  verr == nil,
@@ -277,6 +278,7 @@ func registerMCPTools(s *mcp.Server) {
 			verr := stm.Verify([]byte(cert.SignedMessage), ms, avk, params)
 			return map[string]any{
 				"kind":          "stm",
+				"hash":          cert.Hash,
 				"cert_hash":     cert.Hash,
 				"epoch":         cert.Epoch,
 				"signers":       len(ms.Signatures),