Add heartbeat to detect message server failure