Refactor heartbeat fields