diff --git a/Makefile b/Makefile
index 87e8a6d52..1d2587095 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ LOCAL_PLATFORM=${LOCAL_OS}/${LOCAL_ARCH}
 
 BUILD_DIR=build
 BIN_DIR=${BUILD_DIR}/${VERSION}/bin
+TOOLS_DIR=${BUILD_DIR}/${VERSION}/tools
 
 CLI_TARGET_OOS:=linux darwin
 ARCHS:=arm64 amd64
@@ -93,6 +94,8 @@ ${BUILD_DIR}:
 	mkdir -p ${BUILD_DIR}
 ${BIN_DIR}:
 	mkdir -p ${BIN_DIR}
+${TOOLS_DIR}:
+	mkdir -p ${TOOLS_DIR}
 
 $(foreach oos,$(CLI_TARGET_OOS),$(foreach arch,$(ARCHS),$(eval $(call rocketpool-cli-template,$(oos),$(arch)))))
 
@@ -114,6 +117,24 @@ else
 	${local_build_cmd_arm64} -o $@ ./treegen/.
 endif
 
+# amd64 state-cli build
+.PHONY: ${TOOLS_DIR}/state-cli-linux-amd64
+${TOOLS_DIR}/state-cli-linux-amd64: ${bin_deps}
+ifndef NO_DOCKER
+	${docker_build_cmd_amd64} -o $@ ./shared/services/state/cli/.
+else
+	${local_build_cmd_amd64} -o $@ ./shared/services/state/cli/.
+endif
+
+# arm64 state-cli build
+.PHONY: ${TOOLS_DIR}/state-cli-linux-arm64
+${TOOLS_DIR}/state-cli-linux-arm64: ${bin_deps}
+ifndef NO_DOCKER
+	${docker_build_cmd_arm64} -o $@ ./shared/services/state/cli/.
+else
+	${local_build_cmd_arm64} -o $@ ./shared/services/state/cli/.
+endif
+
 # Multiarch builder
 ${BUILD_DIR}/docker-buildx-builder: ${BUILD_DIR}
 	docker buildx create --name smartnode-builder --driver docker-container --platform linux/amd64,linux/arm64 || true
diff --git a/bindings/utils/state/minipool.go b/bindings/utils/state/minipool.go
index 1491d986d..2fd2e68ce 100644
--- a/bindings/utils/state/minipool.go
+++ b/bindings/utils/state/minipool.go
@@ -63,16 +63,16 @@ type NativeMinipoolDetails struct {
 	UserShareOfBeaconBalance          *big.Int `json:"user_share_of_beacon_balance"`
 
 	// Atlas
-	UserDistributed              bool
-	Slashed                      bool
-	IsVacant                     bool
-	LastBondReductionTime        *big.Int
-	LastBondReductionPrevValue   *big.Int
-	LastBondReductionPrevNodeFee *big.Int
-	ReduceBondTime               *big.Int
-	ReduceBondCancelled          bool
-	ReduceBondValue              *big.Int
-	PreMigrationBalance          *big.Int
+	UserDistributed              bool     `json:"user_distributed"`
+	Slashed                      bool     `json:"slashed"`
+	IsVacant                     bool     `json:"is_vacant"`
+	LastBondReductionTime        *big.Int `json:"last_bond_reduction_time"`
+	LastBondReductionPrevValue   *big.Int `json:"last_bond_reduction_prev_value"`
+	LastBondReductionPrevNodeFee *big.Int `json:"last_bond_reduction_prev_node_fee"`
+	ReduceBondTime               *big.Int `json:"reduce_bond_time"`
+	ReduceBondCancelled          bool     `json:"reduce_bond_cancelled"`
+	ReduceBondValue              *big.Int `json:"reduce_bond_value"`
+	PreMigrationBalance          *big.Int `json:"pre_migration_balance"`
 }
 
 var sixteenEth = big.NewInt(0).Mul(big.NewInt(16), oneEth)
diff --git a/shared/services/rewards/test/assets/rp-network-state-mainnet-20.json.gz b/shared/services/rewards/test/assets/rp-network-state-mainnet-20.json.gz
index ce385c4a9..5aa2e3a90 100644
Binary files a/shared/services/rewards/test/assets/rp-network-state-mainnet-20.json.gz and b/shared/services/rewards/test/assets/rp-network-state-mainnet-20.json.gz differ