Started adding heartbeat and latency check