Adding client / server heartbeats.