Added heartbeat retries