Adding generic heartbeat to common client