Add client heart beat support