Add automatic heartbeat capability