Add channel heartbeat enhancement