Proper heartbeat events handling