Added Heartbeat feature