Updates for heartbeat handler