Using the new heartbeat events