Adding support for Heartbeat