Added Heartbeat mechanism